You're doing the right thing. Just keep it up. Stop exercising a couple days before the UA and still follow the dillution sticky. Substitute gatorade for water and maybe only drink 30ozs.