Agreed. I think taping is probably the right route to go until spring 2018, regretfully. It was a fun and learning experience all the same.

 

Let me say one thing about the Flex Tape if you go that route. It is like cement. Once you put it on, it's on and nothing will get through.

 

not trying to get into another long rant about leaking roofs but....took my entire headliner apart this past summer. Founds 3 leaks. Patched the **** out of them. Ran the hose again....twice and problem was fixed. Come November and the heavy rain, started leaking again.
I've given up trying to fix the leak but What I do is each fall I clean up around the sunroofs and then lay down covering of the wide black gorilla-grip tape. It seems to help me out till spring. Come April I peal it off. A bit of rain hear and there seems fine but heavy constant rain does me in.

 

And to think that I almost bought a D2 that did not have sunroofs. Oh well. Like an old house with single pane windows, tape them up for the winter and strip them for the summer.