I don't know if you have this style around, but you may want to check out aikijitsu/aikijutsu/aikijujitsu (and many more variations to spell it). I trained in that before doing aikido and I have been able to carry over some stuff. My teacher didn't focus too much on the aikido aspect, so that is new to me, but other teachers in the style do a lot of aikido. There are lots of joint locks and fun throws in the style along with lots of fun weapons.
It will help a lot with your ukemi and it isn't a "hard" style. Well... it CAN be, but it isn't for the most part.