Yes, if you don't like the mk3, but double/triple check all the bodywork first......rust in some places is terminal.
Where should you look for terminal rust???
But for the purest engine experience, displacement has no replacement. All other methods are simply attempts to artificially recreate the benefits of displacement.