Opinions on suspension needed please :)

[lostmind]

I know there are a ton of posts on suspension setups. I've read through a ton of them already and I am still unsure on what I want to do to my Yaris 5 dr hatchback.

It's my commuter car, but I am already sick of the bobble head effect when changing lanes. I gotta fix it, but I don't want to sacrifice ride comfort too much.

On other cars, I have found just swapping springs usually ends up in a horrible ride as the shocks/struts wear out prematurely. So I am leaning towards a full replacement, shocks and springs on the Yaris.

The only problem with this is that by the time you have both the TRD shocks and springs, you are looking at $600~. It's only a few more hundred bucks for coilovers...

I don't plan on putting anything bigger then 16" rims on this car. Although I do plan on putting aftermarket rims and tires on.

So with all of that, what would people here recommend? Anyone with direct experience on the TRD combo? Or TRD shocks and another brand of springs? Or coilovers? Would be really appreciated!