If you're doing all of that, i'd go with the OME kit and call it a day.
This way you don't have to worry about sagging springs again (especially the rear), the rear OME shocks are longer to help with flex.
Also, may want to try disconnecting the sway bar and going for a quick spin to see if that quiets up the clunking. The mounts & bushings are well known to cause noises on our vehicles... takes a few minutes to diagnose and they're cheap to replace if that is the cause.