Sounds like you are doing great! Good luck with the Plantar Fasciitis--I used to have it to where I couldn't stand up in the mornings. Now I stretch religiously before and after any exercise, and that seems to be working as a preventative. The massage sounds good, too.
Funny thing, the first doc told me to stop running and take up cycling; the second doc told me cycling could also be a problem unless I got a pair of real cycling shoes with nice stiff soles. Sounds like you've already got that one covered, so hopefully your problem will be resolved soon.
Dagna