My kit is six bottles. it was $17.99. It includes everything in the kit to which you linked, plus Sepia Tone. Honestly, I can't see myself ever using Blue Black, Olive Tone, or Brown Tone, except perhaps very mildly as mixers or on heavily toned prints. It is too bad the five bottle kit got rid of Sepia Tone as opposed to Blue Black or Olive Tone.
If you call Freestyle, they may still have the six bottle kit. It is called Marshall's Spot All (Kit 6BT). The side of the box says MS6BT and BKA. The SKU below the bar code is 96727 51704. They do mention that the kit on the Website replaces another kit, however the number they list cannot be found on the kit that I have, so maybe it replaces another kit.
They also may have a three bottle kit, and you can certainly purchase individual bottles. Ask them what all they carry when you are on the phone. I would say the essentials are Neutral Black and Sepia Tone. You can probably mix most of the tones you need using those two.
BTW, now that I have my kit out, I can see that my favorite brush is called an 18/0, and I like the one with a fat handle. I don't think most recommend a brush this fine, but it is my favorite. I also have 5/0, 3/0, and 00, but they never see any use.