3.9 Stroker

Also, engine manufactures sell 3.9 short or long blocks usually cheaper than the sum of machine work and parts for some engines

Just my two cents, but if you are hell bent on keeping the 3.9 then I would put some KB pistons to get some compression, have a good valve job and bowl cleanup done, and regrind the cam.