Dont over due the water. Do you drink beer? Its a dieretic meaning it makes you piss so dont stop if you already do. Follow the plan you have already laid. And a couple days before piss day make sure your not just pissing water, your gonna cause yourself to fail doing that. Eat and drink regularly, drink 3 8 ounce servings of water a day and exersise, sounds like youll pass. Just dont smoke no more and you'll be good.