Take a true polish and a buffer and those water spots will come out. Please check-out my "How to detail a crossfire" thread. Good to see you finally succeeded.