im think about doing the same thing. but my set up will be

D16Z6 head
B7 block
Upgrade pistons and rods
310 fuel injectors
motor rebiuld( internals)
Td05 turbo
only gonna be doin about 6psi( i dont race)


so yeah.. thats gonna be my set up by this summer. in my 1992 eg.. sound good? good luck with urs