OEM or equivilents are your best option for comfort, you just need the shocks.

i personally would look for some new tires if ride comfort is an issue. look into the michelin PE2's, they are worth some money for summer tires but the comfort is supposed to be way up there without sacrificing much, and actually outperforming most in the wet.