I agree on one point: Apple should be refunding a fractional laptop value to anyone who bought a device with the butterfly keyboard. This is a pretty underwhelming agreement.
I disagree on your other point: I think Apple absolutely did the right thing removing the charger. Everyone's got a charger at this point, and making it a nominal option during the purchase of the device would be good enough.
And in fact, I think the law should be that anything that can be charged by a Lightning/USB-* charger should be. I recently acquired a rechargeable flossing device, and an electric razor and I see no reason why these should have their own proprietary chargers.