I'd hit the breakers with a ruler,after fully taking in all the measurements of present engine/self, then you'd truly get a real idea of what's availible,instead a few suggestion's. .
If I were in your position,i'd be looking for something like a larger top-end kit to suit your present motor,else you'd have to deal with issues like electrics,wiring,instruments,exhaust etc.to suit new motor.