Ok, I'll respond to my own question. I put a screw driver between the trim ring and the panel that holds the switch opposite the side of the windshield and pushed on a clip to release the rear of the panel. The panel, then, has to move toward the rear of the car and it drops down through some slots on the windshield side
Now, I still am not sure of where the leak is. I cut a trough in the back side of the place where the screw I mentioned earlier, so maybe that will allow water out where it pools. If it works, then I'll take a good picture of exactly what I did and post it.
