Sounds like you've got the right idea. Just do a light dillute the morning of the ua.
Drink about 24 ounces of gatorade
pee 3 or 4 times
use your midstream urine for the collection cup.