Ok, now I have finished the suspension exchange.
Based on this, I decided to go with 865 and 15 mm of spacers, that is what ARB USA recommends.
The removal of the AHC stuff was not fun, I drilled a hole in the trunk for both of the rear shocks and had to drill the top lug of the shocks...