its a cj-5, already has the fixed yoke.

i think you should go SOA. if you are re-wleding spring perches anyway to correct pinion angle due to lifting, might as well put those spring perches on top. do some searching on line, there are millions of write up on SOA conversions. read them and figure out if this is something you think you can do. I would also consider not using your stock springs but retro-fitting some stock yj leafs in. the wider, longer, spring will give you better flex and a better ride.
if you are not a really serious off roader and only plan to run moderate trails..a 2.5 or 4" lift should be fine for you...just bolt it on and use some shims in the rear and go.

good luck