I have this exact same problem with my 16 longhorn.

The water comes down the pillar and out of the corner of the map lights. '

Only when it rains really hard I've blown out the drain holes and no help.

So I just taped the top of the sun roof.

LOL not sure what else to do but I won't go to the dealer for the stroke job.