Think of how good a fighter you are now, injuries and all...and then consider how much better you'd be pain- and injury-free? Should be a no-brainer, Thor...you can still do the movements solo just so that your joints and ligaments do not forget their 'duty' so to speak, but keep it non-contact and low or no stress on the injured parts.
Think of it this way...should you continue on as you've been, you risk injuring yourself even more in which case, you may never attain that knighthood. The pointy hat isn't going anywhere...there's always the next event.