The ED30 engine was the 'same' as the GTI engine with a bigger turbo (KO4 as opposed to normal GTI KO3s) and uprated internals. This engine was also found in the Leon Cupra and the S3. There are a few 'controversial' threads in the mk5 board over whether there was any difference between the S3 engine and ED30 engine or not and I don't think there was any conclusive evidence one way or the other. Either way the difference, if any, was minor.
I believe this is the same engine thats going in the Golf R, albeit it may have some minor tweaks over the ED30 spec but yes, fundamentally its the same.
The new TSI engine in the mk6 GTI is quite different from the mk5 engine, though its easy to see it came from the same stable.