Stretching is good, yoga might help especially if you can find an instructor who is used to working with cyclists. And yeah, massage! Check to see if your health insurance covers massage therapy (many do, might require a referral from your regular doc but that's usually easy to get).