Griot's Complete Compound (#10862) works really well, I've removed water stains, swirls, light scratches, firework chaff marks, etc., just by hand, it's safe (vs. more abrasive rubbing or buffing compounds).
Here at Amazon, cheap, so even if it's not as effective as you'd like, it's not much of a waste (though I highly recommend it as part of a detailing kit).
https://www.amazon.com/dp/B00PA2LMD2/ref=cm_sw_r_cp_dp_T1_Ac-uzbDFQ3MWE
The paint/CC/thickness on modern domestics is kind of ******, so there's not a ton to work with, but a really good, very careful detailer/paint specialist might do the trick.