; Your water leak is not necessarily the result of a clogged sunroof drain tube.
Do you have anything mounted on the roof that was not installed by the factory?
A light bar or anything of that nature?
It could also be your factory roof rail bolts/screws are rusting out, allowing water to get in - or you could have a bad door seal or a door out of alignment.
You have to figure out definitively where the origin of your leak is - and it can be a real PIA trying to isolate the cause.
Commanders - particularly those with sunroofs are pretty notorious for having water leaks - the sunroof drains are a common cause, but my point is, they are not the only cause. Could also be that the sunroof seal/gasket itself, needs to be replaced.
Until you definitively isolate the cause, you can only speculate - but you can't just assume it's the sunroof drain tubes, particularly in your case - where it seems like that issue has already been addressed.
There can be other causes as I mentioned above - any of which would produce the same, or very similar symptoms, with water leaking out of the driver's side front interior grab handle over the dashboard.
You may have to go out in your driveway with a hose and just run water on the roof continuously and try to track the source of the leak down that way.