Greg ;
Not to worry, everyone makes mistakes, some are too afraid to admit them .
I assume your ingress of water is puddles in the tool/jack well ? .
Before attacking the window grommets look closely at the small drain tube in the filler neck ~ that came lose in my '82 240D and gave me fits before I discovered it ~ I was trying to find the backlight's water leak and there wasn't one
.