Full disclosure: I read nothing but your first post.
Going to play devil's advocate a bit here...
Icon doesn't know what size tires you're running, what offset your aftermarket wheels are, etc. etc. I'd be willing to be that if you were running stock wheels/tires (like no one does, but maybe their test truck did) you'd have no issues hitting your reservoir. Or, if you were running a wheel with a more aggressive offset (which is more likely of their test truck).
I never hit mine, but I am positive that had I not been running 1.25" spacers I would have absolutely destroyed the things.
As for springs: so many people have tried to make those Super Flex springs work with big weight in the back. So many people have failed. OME 861 seems to be the ONLY spring that's up to the task.
Shocks: I still don't understand how your shocks are so different. You should have wayyyy more up travel than what your exposed shaft shows you're capable of.
Sorry if all that has already been said. Sucks about the locker!