My sensei swears by Arnica, you can take it internaly, externaly, I found it does not do much for me, but lots in the dojo keep it around all the time. Aikido is an impact sport, sometimes a colision sport...with the ground with all the falls involved. Injuries are rare but the wear and tear adds up...so it seems to help some.

If you feel otherwise decent and Dr says ok, if you can't lean over can you do base miles on a trainer? Always need more of that. But rest up, you'll be better soon and it'll all come back.

One of the what ifs is that if you two weren't in such great shape, willing to bet your injuries would have been worse.