If I had the space+money, I'd go for a Factory Five kit: https://www.factoryfive.com/mk5/complete-kit/

and add an LS drivetrain.