Which brushless motor fits an RC8?

[Havoc]

I just converted my original RC8 RTR to electric. I used the AE kit since it required no modifications and did away with the mechanical brakes. Anyway, the Tekin 1350kv and 2250kv do not fit the motor mount, the can touches the chassis and the screws do not line-up. These are considered "truggy" motors, but it looks as if the "buggy" motors are just shorter, but the same diameter. My old Novak HV will fit, but that has a new home and I plan to run lipo.

So, my options are:

Castle MM, but which one? I heard the 2250 and 2650 are different sizes.

or

Tekin "buggy" motors, but again, is the diameter smaller?

On a side note, I did use the proper spacers or the new spur gear wouldn't be spinning. Thanks.