What about chiropractic or body worker therapy?
I'm thinking address the whole body, since you have a few things going on.

Most quality PT places should have a TENS, ultrasound etc..

If your injury was a hit or fall of some sort- something could be out of alignment.
If so a good chiropractor, or possibly an Osteopathic dr, or physiatrist might be of more help.
ask questions and interview them before selecting, so you aren't wasting time with uniformed care.

A TENS might be helpful - your PT should be able to set up a test or trial to see if it would and then your Dr could Rx one for you.

Ultrasound will feel good most likely if muscle pain is an issue.

My dad uses his TENs quite often now for his DDD.
TENS helps to block the pain signals.

I have a EMS {electric muscle stimulator} and my chiro uses a IF stim at his office, as well as a Low level laser {aka cold laser,soft laser}
- these all work for me for my muscle pain.

nothing to be afraid of at all - unless someone turns the stim up too high - but you can control that. usually they (PT) slowly increase the stim and ask you to let them know when to stop at that setting.

some videos links -
http://www.google.com/search?q=pain+...46717b9b9556d9


this link has quite a variety if alternative care info links - although it is from our TOS forum -the therapy info covers many ailments -
http://neurotalk.psychcentral.com/post388-1.html

If you do feel better with heat look into far infrared heating pads - penetrate deeper and no chance of burns. better for cell healing also.