+1 for the 30DET, you're rebuilding anyway so go splash $100 on an RB30E, buy pistons and rods to suit and longnose the crank, use your 25 head and the cams you were planning on. Go the GT35R with .82 (minimum) or 1.06 housing.
If you go the 30 make sure you let Kyle know it's a 30 in a 32gtst so the manifold will fit. He'll also want you to get a 50mm gate.