Yeah a different engine would be too much hassle, too many other factors would have to be changed as well, gearbox, brakes, new ECU to name a few. I've got a warranty that covers pretty much every engine part so hopefully could get it done that way. If not I've got a mate than can help me fit a new one.
On a plus not I could use the old block for a coffee table lol