Alright - I'm somewhat of an audio n00b, here is my audio profile:
Cheap Denon HTIB (AVR 681, 68S sats, unsure of sub model) for living room, very very rarely used.
Tivoli iSongbook for bedroom/bathroom/kitchen, used very often
Klipsch promedia 2.1's for home office (where I spend 95% of my audio listening time)
Used to have a set of HD590's but headphones just aren't for me. I also built an altoid amp for them..
So.. I'm now looking to build a nice system for my home office so that I can move my promedias to the bedroom. I use them for roughly 75% music (all types, some rap so I would like a sub) and 25% gaming (where a sub is required imo). I was at first considering the Audioengine A5's or maybe Swan MK200III until I realize just how huge those speakers are and am leary of the lack of bass. When a rocket hits the wall behind me I want to feel it, this is why I bought a house

I can use wall-mounts, but I believe I'm better off with a 2.1 rather than 2.0 so I can cut back on satellite size..
I have room for a receiver but would prefer something smaller and nicer looking than a 'full size' receiver although I could technically hide it somewhere I guess. Aesthetics is important to me for this application
Price range... $400-$500 for the speakers and receiver, max. I can add a sub later if it pushes out of my scope
Thoughts?