Use a 4.0 Cherokee '91 to '93 head - has raised ports & is the best flowing head available.
Really want it to scream ?
Run a 'U' pipe from the Factory exhaust header-
up to near the carb - mount a Turbo onto a weldable flange on the 'U' pipe - then plumb the air to a 'Bonnet' on the carb - check with Blowthru Turbo @yahoogroups.com as to mods for the carbi.
Pump 6 lbs. of boost into that 258 and try & stop grinning.
Strokers@yahoogroups.com put 258 cranks in the bigger bore 4.0 blocks - 4.5 - .
You can also swap over the EFi from a 4.0 along with their very nice Aisin Warner 4spd. automatic trans.
www.mjmturbo.com contact Jamie as to the correct sized Garret Turbo - should set you back $550.00 .
Be sure to change out the valve keepers & locks to a High Performance brand - as the AMC units drop valves easily.