I wouldn't risk the homemade whizzinator. It sounds like you got a pretty good PO. If you're caught subbing you're in deep shit. Besides it sounds like by the time you get your next UA you'll probably be ok.
Exercise till 2 days before UA.
Eat a high fiber diet with metamucil.
Follow the dillution sticky the morning of the UA. Use gatorade instead of water.
