IMHO, find a good 87-90 350 Truck EFI engine, go with either the TBI or carb, swap it out and roll.
IIRC, these had the roller cams which are more efficient since there is less rolling friction. These engines are easy to find and do very well in stock form.
If you keep the TBI, you...