Yet Another SD EFI Rebuild Question

[Uncle Grumpy]

Hi, I have bog standard '91 5.8l EFI SD 4x4 with C6 with only 40,000 miles. (ex-military Ambulance). I blew the head gasket so the engine gets a overhaul. Due to the weight of the body it needs a little help to get going. To keep it within states emissions reg's it doesn't easily allow major modifications, so it will need to stay with the air and egr. My aim is to keep it SD friendly but try to help it along the road and still useful in 4x4. My shopping list so far has Comp Cam 35-255-5, Performer heads 1.90 valves, long tube headers, 1.6 full roller rockers and whatever oversized standard shaped piston to fit the required rebore. My question is if this setup is wrong or are there changes that can be made to help it further without major conversion (ie maf setup) cheers