If you could get hold of a nice electric buffer you should be able to remove the waterspots. My friend had some bad ones on his car and the buffer took em right out.