Just an idea, on the snorkel for water, I would use a 3"pipe fitting and put like a 5" tube to create a "bucket" before the filter to catch water. You can tap in a bolt to drain it. Also instead of a ball valve, look into an exhaust dump. You can get an electric one so you don't have to ever leave the vehicle. I think cutting down to 2" would put more air restriction on your motor though. Don't know for sure.
1995 ZJ, 5.2L, NP249, stock suspension, e-fan, CAI, engine needs work!! Plan on lift and tires when money finds its way here...