This is really what I would do as well, Turbo now, and then save for your new long block.
Once you've got the Beef'd up new block and rotating assembly, THEN choose your HCI (might need 185s at that point, or something different, you never know), then your trans, then your rear end.
Turbo...