Hey Red, glad to hear you managed to find a different doc. The wait until July 7th will be worth it -- guaranteed. I don't even know a thing about the new doc, but there's no way he can be any more barbaric than your last one.
If you do pop a few oxycodones before you go in next time, just be sure to at least tell the doc though :) That way if you get any other kind of anesthesia, they'll know (A) to adjust the dose to avoid excessive respiratory depression, and (B) understand what reversal agents to use just in case you're too far under and they need to pull you back up.
I'd bet this other guy just does things the right way this time and it won't even be necessary though :)