Stop drinking "tons" of water. It does no good.THC is not water soluble. You should be fine with the amount you've smoked. I would test yourself a day or 2 before the UA. Follow the dillution sticky for the morning of the test.Don't overdue the liquids.