Thanks everyone! Based on all your suggestions I'll start with
- More protein intake after the match
- More cool-down / stretching
- Some light massage / cold packs
- Light workout next day even if I feel stiff
as short term fixes and
- Play more regularly (though less possible given my routine)
- Raise the bar on fitness!
- Improve overall footwork / technique
- Finish points like Federer :P
as making my routine better over the long term.
Thanks a lot guys!