It is really hard to find the right combination of interventions, but it might be easier if you just change one thing at a time. That way you can determine what works best and what doesn't make a difference at all.
Good luck and keep us posted. I look forward to hearing what the surgeon tells you on the 5th.