When I had my 1999 +4 water found its way into the car via the foam strip between the heater box and the bulkhead. A length of duct tape stuck over it did the job, so maybe worth a try. Here's hoping you get it sorted.
Sid
Ex 2014 3.7 Roadster in Ferrari Le Mans Blue Ex Indigo Blue '99 +4 Ex MogMMX Innovations winner