I'll second Brad's recommendations.
The Super 3 are worth the step up from the TS3.
The TS2 would be warmer and more efficient, but the Super 3 is faster and with a future sub would be a big step up from the TS2. (Due to the TS2 warmth, the Super 3 can sound bass shy, but measures the same.)
Bedroom rock? (I'm probably just too old to understand it anymore.
) The only thing that rocks in my bedroom doesn't need music to go with it.