I can appreciate the options you’re contemplating. I have a 2018 and considered my options too before deciding on a refresh. What I ultimately decided was a bit different than what it sounds like you’re leaning towards. I wouldn’t talk you out of it, but I would say that I am 100% happy with what I did, so for what it’s worth here’s my thoughts…
Ultimately, for daily drivability and cost/return considerations I decided against mid travel. I was going to go Fox FRS 3.0’s but after seeing the eClik in action I decided to go with live valve oem with the SDI revalve tuned to the eClik system. Upfront I did Icon UCA and RPG 2.25 collars. On the rear I did Icon leaf (option 1) and SVC bump with Fox IFV. The performance of this setup is substantially better than stock and it makes me grin every time I drive.
After researching and evaluating different options, I feel the eClik with SDI revalve performs slightly better in most off road situations and much better on road than non-Live Valve FRS 3.0’s and at a lower cost point (the off road exception would be for when you would benefit from the external reservoir but that is pretty rare even when desert running fairly hard).
Good luck and best wishes with your build.