Chris - have you conducted the water test? From your narration, I would put my bet on your windscreen sealing.
I would suggest taking it back to the shop you got it fixed and tell them the problem. It may not be rust since you've just changed your screen.
They may have to check the seals around the screen once again.
126 tailed by a 203, 129 leading the pack.