I use a product called Gyeon Eraser. It's a spray that is basically like isopropyl alcohol mix that strips all oils from the surface. Instead of water beading, it just sheets off.
I find it way better for windshields, mirrors and lidar/radar sensors. Hope this helps.