Love the square bodies.
Planning on keeping it for a long time, I would go fluidampr balancer, gapless rings. Leroy gets them. Also the injectors and a pump. Stock pump or bumped up a bit? make sure hardened internals for ulsd.
You still have v belt 4 bolt pump I take it? If so, the hmmwv fan clutch for 100% lockup and control to engage it whenever you want- like bottom of a big hill when towing. Also can have it engage when the a/c is on if you want for colder a/c in stop and go traffic.
96 military take out=GM block not optimizer from GEP. rethink that imo. if he pulls it apart and the block is perfect then ok. But not if it has the slightest of problems. double check 2 rear cylinder specs real close, main webs, and heads.
keep us up on the progress