You sound to be at about the same road I'm at.... I was able to find an 05' turbo and just bought an O2 housing. It might just do it for you... But my philosophy is to add all the hardware first- then turn to the power adders if needed.

Something about power adders just scare me.

 

^ see my sig...i almost got everything i need to throw in a bigger turbo. More suporting mods like >>>fmic,clutch,shep tc/trans,injectors,valve springs etc

 

Nice runs man!