I ended up getting some cerium oxide (a glass polish used by windscreen places to remove fine marks. Also used by jewellers to remove fine scratches on watch face glass). The screen came up A1 so I used it on the rest of the cars glasswork as well. Now water runs straight off the glass instead of hanging on, similar to the effect you get when you use Rain-X.