Definitely would love to have a look at your 40, the great thing about this forum is that already I am earning about what will fit and what wont.
A 5 speed gearbox would be nice, but not critical at this point, and maybe do it at a later date when I can find one. The existing 2F is not in good nick a all, and I don't see it as adding value by spending money on it...
She's not much to look at! In parts at mo! You can have a perv at the block and heater As those are the only bits finished! Will PM you.
Might be tricky matching the gearbox input shaft spline to diesel clutch and length of the input will probably cause you grief too with the diesel bell housings. You can buy the appropriate input shaft for your h42 gear box but they ain't cheap!