Thanks for the pictures, I remember now seeing your reference to the Hirose parts now that I think about it. I was going to consider either raising the cab floor or modifying the frame to fit the 10 pin. I certainly agree yours is a better solution for upgrades without or with minimal mods to the frame. I have a spare MTH 10 pin to experiment with but if I can't come up with a reasonable solution, will follow your lead.
Did you end up replacing with an RS 550 or the 555? just curious, I remember some older comments on those motors and I need to replace one as well. There seem to be a few different variations available from Mabuchi. Or would you suggest a different motor?