for the water spots just try a light polish like WG finishing glaze and a white polish pad. and putting a wax over a different wax is just wasting the first layer of wax. just use 1 wax and make use u wait 12 hours before application of wax if its going over a sealant.