Just an idea, and one that I use:

Instead of Rain-X, simply put a coat of carnuba wax on your windshield, as if you were waxing the body. You'll be surprised at how slippery it makes the windshield, and how well the water beads.

Lasts quite a while too. Make sure you buff all the residue off first though.

G'luck!

~Paul