You just won't quit with the D-series will you. I would recommend a D16Z6 long block if your going to get anything that make your life the easiest. Depending on who you buy the motor from, it may come with a clutch/flywheel or it may not. If you plan to keep the motor for a while, I'd consider upgrading the both of them while it's all apart anyway.
__________________
Andy - Reinstated
Hybrid Forum Moderator
'06 Subaru Legacy Spec B - Stock, for now
'98 Civic EX - CTR headlights and grill, Kosei K1's, for sale
'90 240SX - SR20DET that will never get installed, project car.