I think it's a solid plan with couple of small wrinkles:
a) Bic F12 sub is will not good match for excellent speakers such as 95-24
b) Depends on how long you're going to wait to pull the trigger for full 5.1 - matching center speaker might become harder to purchase
Another option for solid sets are from HSU - they specialize in subs, but their horn bookshelves do not suck at all. I heard them a bit a while ago on 2012 and they played music with confidence
http://www.hsuresearch.com/products/speakerpkg.html
You might want just to buy the speakers and consider replacing sub once you get to newer larger space - you see - sub needs to be matched to volume of the room.