well...
a lot of solutions, some are feasible some not:
new half shaft with the same configuration - sooner or later I will be here enquiring again
new stock half shafts with 24 spline ( still 10 spline on the diff???) - better but not the best
stage one configuration, very good option
series trek, quite expensive
Great Basin Rover, quite all right
the axle swap for Salisbury and ENV aren't really good solutions in mine opinion (I know that I suggested this before). Both are difficult to find here (Portugal), and after some enquiries concluded that the availability of parts is uncommon.
May be I have a nice conversation with Santa and fit an ARB as well...