I'm the same - moved to Meguiars from Autoglym for the same reasons. Clay will deal with hard water residue, so keep your fingers crossed! If it's bleached it will only come out with cutting.
DaveW '05 Red Roadster S1 '16 Yellow (Not the only) Narrow AR GDI Plus 4
