For those playing along at home - it's all a lot more clear now that the windscreen is out.
The top corner is rusted pretty badly, sealant was applied inside and out all over, fairly clear that the windscreen has never been out.
Basically, the dealer bodged it up, it was never fixed properly - so no wonder it continued to give us grief down the track.
https://imgur.com/a/mgBd4ME