Please help!

2001 V70XC 92K: Sunroof will operate but will not close when using the the auto function. I have to try to "flick" the switch just to get it close to the closed position. The problem is that when it rains I get water coming in from both of the front corners of the headliner as well as a sloshing/bubbling sound (in the rear part of the headliner) when accelerating. I purchased a Upper Console, with a sunroof switch and replaced it hoping it was just the sunroof switch but no luck and I still have the same problem. I would like to see if there are any other suggestions before I take it to a dealer. Also, what can I do to ensure that the sunroof drains (2 or 4?) are unclogged. Thanks in advance for any help and/or suggestions.