i too have that same problem. i have yet to have my car in to get the fuel tank heat shield recall performed but im pretty sure my leaks from the filler neck. it only does it if i fill the car up completely and only leaks for about 1 gallon.
i bet your sunroof is what is leaking. my windshield weather strip is missing and i have never had a leak. i did have a leaking sunroof on an older 850 right by the mirror. it would leak when i pulled out of the driveway.