Yeah it looks like you're headed in the right direction.Stop exercising a couple days before the UA,make sure you take your midstream piss.
I would have a backup plan in case you don't get clean by test day.