I'm going to go with DF210 on stock shocks and struts and once those give out probably go aftermarket, maybe TRD. The valving will most likely be better on the TRD, though perhaps a bit harsh with the combo of lower, stiffer springs and less give on the valving.

Eric, I believe KYB was making suspension bits (shocks and struts) for the Gen 2. They have a  great rep from the Gen 1 folks that use them. No part number yet, from my searches anwyay, sorry.

they are definitely a much stiffer ride 

i owned a CJ7 and i really never thought of the ride as rough in it - i guess cause it was a four wheeler plus i had decent size tires on it too.  was great for climbing around in Death Valley!

I have these in my B.. not really that much improvement in handling. Its definitely stiffer than stock, but really any aftermarket performance shock is going to be stiffer. Its still a comfortable overall ride, you do feel the bumps and holes a bit more. Ive got the sway bar and strut bar too.. so my overall improvement of ride could be attributed from any of those. For the money, like low $400s.. Id probably would have gone with some Tokico HPs instead, reason I got them is cuz I could incorporate into new car price and pay at 8% over 5 yrs lol.