I have always had good luck with rain-x. Don't get it on anything other than the glass though. If you are concerned with that, wax has worked for me. Someone else may have a better option.
Rain-x....... IMAR makes a good glass product that buffs the windows and gets the etching out......better than whink IMO......but whink works well also, then rain-x after.....