Please be careful about taking the Benedryl + Oxy together. I would try taking a small amount of Benedryl first, and avoid timing it too closely to the Oxy if possible. You can always take more Benedryl if the first dose doesn't work

Are you splitting the pain pills so that you are tapering off them? It will obviously help them last longer, too.

I can't wait until you're feeling better and sleeping better