Had new OEM front and rear shocks installed along with the mountings and rubber bits for the front ones, also replaced the front sway bar bushings and tie rod ends (closest to the wheels). Took car in for a wheel alignment and an quite amazed by how much of a difference it all made. Ride is still firm but not jarring as before, also all the rattles and suspension noises are gone.