I'd say your use of swatches looks pretty good. I have recently started to favor Illustrator because it looks cleaner (gotta love vectors), prints well, and is generally smaller in file size than PS files.
This is the only example I have on my computer at the moment and its not finished, but you get the idea.

I'm gonna set up my own scanned swatch library over the break which will be nice.