No from the Apple store. See my other post. This is poor design, regardless of where it came from. There should be a hefty NTC or inrush current limiter in the charger.

Have you looked at an 87W USB-C charger to see if this was addressed with the latest generation of laptops?

Not yet. I’m not due for a hardware refresh for about a year yet. I’ll probably head in the direction of Lenovo then.