Glucosomine and anti-inflamatories (lots of both, even if it's not hurting.)
Get clipless if you haven't already.
Try not to drive too much.
And it's interesting that you can go longer on the fixie. Same thing happened to me a while back and I also found that to be true.