Should have looked into the TD04 upgrade...

Blouch Turbo Inc. - Our performance turbo upgrades and rebuilds

Pretty much upgrades the wheel and PnP, gives you the up top power w/o losing the TD04 spool... I briefly thought about it but figured my 2.5 was way too big for the TD04, but lots of 2.0L guys on Nasioc like this upgrade.