Yes I'm sticking with original engine and box it's runs really well, and gearbox is good now..
An Audi lump fits nice with a few alterations, I think the one to go for is a late A4/Passat one.
I've made some good connections in the Hy world so if you needs any advice or struggling with parts...