Correct Core I should be looking for

[cschaepe@mediaone.net]

If I am going to be building a bigger than 2.0 T4 engine would a 1.7 or 1.8 core block be the best bet since I would be replacing the crank/P&C's. Should I try to find 2.0 heads?
Any recommendations on engine Code#'s