I went ahead and brought the jeep to a shop to have them look at it. They came up with a really good idea to fix the problem. They took out the foam piece around the drain which was absorbing water into the cabin. Then to stop the leaking at the firewall they put silicone all around the drain and in the drill holes. Cheap fix and so far it seems to be working great!