Have you looked at any of the RV cams? helpful in adding torque. And I'd say follow the cam mfg's directions. New Cam demands new lifters. Many will advise a roller type cam/lifter. I'd agree with them.

I'd definitely keep the EFI.