Yet another update. Saw my po today and she told me that I'd have to go back since my sample was dilute. If I test dilute again I'm going to be up for violation.
Since that place didn't watch me last time I'm going to go with substitution.
If they want to watch me this time could I just say I have shy bladder syndrome and get out of it? Also, when using a bottle with a top that allows you to squeeze and get a decent stream should you just go that route or unscrew the cap?