I really don't use my window cleaners too much anymore since Ive started doing rinseless washes. No more water spots since the dry is right after the rinse.
I'm picky about my glass too, maybe too picky. I like to clean it facing the setting or rising sun. Talk about streaks. If you can clean glass in with the sun at a low angle and get it streak free it's really clean.
I've had good luck with ONR and my windows. I do it as step 2 after doing the roof so everything is still pretty clean and my drying towel is still for the most part dry.