Tyranids and the new stuff I want to get

So as I've gotten further and further into insanity lately, I've decided that I want to do a sort of 'reworking' of the Tyranids army that I've started. Their new book is on pre-order soon in NZ, and about to be released in much of the rest of the world, so I've been messing around making silly lists using the new unit points that are available online. As it stands, I've got a bit of a horde going, with 20 each of Hormagaunts and Termagants, which with the new list I've come up with I'd need to double; the 10 Genestealers I already have (and want to replace some of because they're either awful or broken) that were in the current army are getting relegated to Kill Team - although I'll have them to add if I ever manage to play a game bigger than 1500 points. The current Winged Hive Tyrant I've been using may get swapped out but still unsure on that one, while the Tyranid Prime and Warriors are staying as they are now. Finally are the Carnifexes, which are staying the same and even around the same points as they are currently which makes working with them easy.

With all of that, what do I want to get to make the new list a reality? The following list is what would be required to do it:
- Hive Tyrant
- 20 Hormagaunts (each box has 12 models)
- 20 Termagants (each box has 12 models)
- 4 Genestealers (each box has 8 models)
- 3 Warriors
Luckily the upcoming Combat Patrol box has the Warriors, Tyrant, and 36 Termagants, so that will make things somewhat cheaper, and hopefully I'll be able to get Hormagaunts and Genestealers while I'm working. Plus a friend is willing to go halves in a box of Genestealers making things even easier.

I'm going way overboard with this, aren't I?