Double check how the KONIs are set. Dial them back to the comfort setting (all the way to the left). Rears can be dialed back but need to be removed.
HR's are notoriously stiff for xi's. Eibach Prokits are more comfortable - less rake, more coils, less stiff steel
My setup is Koni sports dialed 20% firmer and I use Eibach ProKits springs. No complains yet from 60 year old passengers.
Swapping to OEM you pretty well need to buy new since shock life is about 50,000 mi. So look at Pelican - but Sachs are over priced