500 cfm is the most you want for a 258. The EFI is well worth it and relatively easy though. Just pull the wiring harness and computer with everything attached and connect the ignition wire -- that's it. The 4.0L head takes just a little more work, but not much. What you have to be careful with is compression and cam specs with the 4.0L EFI system, especially the 1991+ system (87-90 is a little more tolerant, but you still have to be careful). Over 9.0:1 limits your cam choices (higher overlap to limit cylinder pressure). Put a 4.0L head on a 258 and compression goes to something like 9.5:1, so there is pinging problems with the EFI conversion. If I were rebuilding a 258, I'd throw the block and head out and buy a rebuilder 4.0L instead, use the 258 crank and rods with the 4.0L block and head. Use Silvolite 4.0L replacement pistons and machine the dish 1/16" deeper but the same shape. Badger pistons won't take that depth and still be reliable! The deeper dish brings compression back down to 8.8-9.0:1 range (stock is 8.7:1), which will work with the stock cam. You need 24# injectors also. That gives you a good 245-250 hp and 300-320 ft/lbs of torque. You might need an adjustable MAP sensor (easy to make -- adjusts the input voltage) to fine tune it, but it will generally run great on regular fuel. Without the additional dish compression is 9.5-9.7:1 and you'll need to run premium fuel. The adjustable MAP may be required as well. I could run midgrade before I dished the pistons, but got pinging under load -- had to be careful driving. The engine runs MUCH better now that the compression has been lowered, with no power loss. I'm using the 87-90 EFI system which has a knock sensor (91+ doesn't, main reason it's more sensitive to compression). Since the knock sensor was no longer retarding timing, so I might even have a little more power -- seat-of-the-pants "dyno" says it's the same or more though!
If interested go to Yahoo groups and look up "strokers". That's the name of the 4.0L/258 crank hybrid group. Of course I'm a member! I was the first to put such an engine in a car (check out my album), might be the only one! Most of the builders are Jeepers. I've got as much power and torque as a 74 AMC 360/4V, and it shows!