One caveat on the engine swap would be watch out for torque steer. My GVX with stock 1300 engine pulls hard to the left when you really get on it. As long as your ready for it it's not big deal, but it can be a surprise. I've long considered putting a 1500 in my GVX, especially since it came with a 5 speed. Sounds like a fun project!