If I were in your situation, I’d be looking for a used JK 30. I would say go with a used 44, but they bring a premium. Before installing it, sleeve or truss the tubes, and add knuckle gussets. Install new trick ball joints (Synergy, Tera, ect) while it’s apart. Reuse your old gears if needed...