Personally, I would do everything at once. The stock HU is weak, it can power a set of comps, but it can sound better with an after market HU, and even 10000x better with a real amp.

I wouldnt go with the 2-way if you already plan on replacing it.