Try a claybar. They work well and take out imperfections it should take care of the water spots