Polish your windshield with a good polish and light to medium cut/polish pad. Give a thorough wipe down with denatured alcohol. Ditch Rain X and either do a glass coating (I really like McKee's Glass Coating) and or use something like Rust Oleum's Never Wet for Glass. I use both and they both are great.
Replace the wipers too. Inserts are cheap and easy to install.