I use AG Fast Glass after the windows have been polished, find it quicker and easier than the polish.
As for Rain X, it does work well but if your glass is cleaned and polish you will get the same effect. Otherwise try using some wax such as 476s although make sure to apply VERY thinly and wipe off totally, otherwise it has a tendency to go a little hazy especially in the warmer weather.