You can ask your primary to order the hair follicle test and then have the results sent to your primary AND your PM doctor.
The saliva tests do have a higher failure /false positive rate from my research.
The heroin metabolites are a concern, so if I were you, I would get the hair follicle test asap.
That's good that you plan to get it done on Monday. The good news is the follicle test goes back several months depending on your hair length, so you can prove beyond doubt the testing was wrong. Best of luck.
Anti inflammatories can help keep the inflammation from getting worse. Stuff like icy hot, salon pas pain patches with lidocaine can help too.
I am a bit older than you, but I understand. I am a stickler too when it comes to my pain meds etc and I would be beside myself in your situation.
I forgot what the actual measurement of hair length/time frame is but as long as it covers the time frame, it should work out well.
Hang in there.