Replace sub or speaker system first?

[blu-mood]

http://www.athenaspeakers.com/v2/cla...Micra+6+System

I have the above system (Athena Micra 6 in case the link doesn't work), which has performed reasonably well in my small apartment living room (just under 300 sf or roughly 15' x 19'). I have a 60GB PS3 that I use for movies, music, and gaming, I bought an Onkyo 705 and have been thinking of next upgrading the sub and speakers.

1st question: does it make any sense to upgrade now, given my space? (I'll be in the apt. at least another 1 1/2 years)

2nd question: I was thinking of first upgrading the sub (getting 1 or 2, budget around $1,000) and was looking at the av123 MFW-15, eD A2-300, SVS SB12-Plus, and a couple of others, but are those overkill for my room and overkill until I replace the speakers?

3rd question: am I better off simply upgrading to a better total package system, like the Energy Take Classic, or something comparable?

Thanks for any and all advice!