If your b7 is still in proper running order and you are not looking to perform a full engine swap, I would suggest throwing the z6 (assuming it is one) head onto the d15 short block. It requires minor work, far less labor and with the higher compression will net you roughly the same hp figures that the stock d16 would. Its been done thousands of times, and you can find writeups all over the place. Also, you would still have the spare short block if you ever did happen to destroy one, or wear it out.
__________________
Cheap, Fast, Reliable..Pick two
Current project:
Rio Red 91 hatch.
A6/Z6 build, Hondata S300, Tokico illumina/Ground Control.
"I'd rather run 12's on steelies than 15's on rotas."