I'll focus on the bedroom system since you asked about that first. Combine the speakers/sub below and a $300 Denon or Pioneer A/V receiver and for about $1100 you'll have a great sounding bedroom system for relatively not a lot of $$$. I'd highly recommend springing for a receiver that has good room correction built in as I think it's well worth whatever extra you'll spend especially since you're integrating a sub -- it can make all the difference IMO.
http://www.hsuresearch.com/products/value2pkg.html
For the bigger system, that's a bigger expense and involves music so would need to know more about what aspects of sound reproduction are most important to you (i.e. micro/macro dynamics, imaging, tonality, detail/transparency, etc.) and what type of music, volume level, and size of room would be helpful as well. Otherwise our recommendations may not be as appropriate for your particular tastes and situation. Best of luck.