Given the problems you listed throwing the old rig out is a good idea. Personally, I would recommend a well made Syrian from J & R or www.furathookahs.com
as they both offer wonderful products with excellent build quality. A KM from hookah company, hookah life or PYH would also be a good bet. All of those options will give you a great rig that will last you many years and give fantastic sessions.