that bike looks pretty nice to be pulling the motor out for what 10 more HP? I get it tho, it's worth it for the light throttle alone.
I did a similar swap. I put a EV motor w/systems into the older Tonti frame. It fit fine but the tank will come very close to the rocker cover. I mounted the coils to the frame tube under the tank and put the fuel filter.reg.pump and some electronics in the battery space. because of the big CPU of the EV I didn't have room for the battery so it went under the tranny in place of the crossover. I am changing this arrangement this winter...you will probably have to use pod filters like I did, I was able to retain the intake tubes between the filters and manifold but I'm going to shorten them now..to complicate things further I grafted Convert running gear on.. It's a real hoot and has just the right amount of pep that the convert needed.
I'm now looking for a V11 sport motor and electrics for my next project, anyone?