I managed to score a pair of new Bilstein 5160's for a really good price. They have the same extended length as my 3.5-4" 5100's and are shorter so they should not pose any problems when flexing without the bumpstop extensions.
Based on my measurements, at full droop the coil will unseat, so next I think I will get some front JKU Rock Krawler 1.5" springs, they have a triple rate spring that is 2 inch longer than the WJ CRD spring extended and its main rate is identical to the WJ rate.
Someone used heavy duty JK AEV springs and netted the same length as advertised for the JK, so I have high hopes that the Rock Krawler springs would keep my car at the same height, upcountry + 1/2" spacer