Carli from what I was told by our rep over there is replacing all Bilstein kits with Fox shocks now. If you really want a smooth ride and something that will perform I'd say go with a 2.5" shock. Every kit we have done with the 2.5" shocks have blown the entry level 2.0" shocks out of the water. I think in part its due to the weight of the diesel trucks, and the more surface area on the pistons to absorb that transfer of motion.
From my personal experience you can't got wrong with either Carli or ICON, I personally run an ICON 2.5 leveling kit on my truck with the ICON 2.0 shocks. I think I will be switching to the 2.5" piggy back shocks soon. The ride is great with the 2.0's but I've done enough of the 2.5" shocks on these trucks to know it really makes the ride that much better with the 2.5" ones.
The PMF three link also makes a huge difference in ride and handling, we had a set on our 2012 shop truck and it really did dump all over the stock radius arm set up. Something else to consider any time you lift your truck and go with larger tires is traction bars, PMF has some really HIGH quality ones of those as well. We recently did a set on a customers 7" ICON kit and I was extremely impressed with the quality of them.
If you don't off road much you'll be fine with a 2" shock, but if you do occasionally take your truck off road for work or play the 2.5" is a worthy upgrade with no sacrifice at all in road manners ( rides even smoother on the street ). We get a lot of oil field guys in here buying lifts, the feed back from them mirrors my experience on it.