What are your 5 - 6 serves? Since you don't always get good spin on them it might be better to only work on two paired serves, practice them a lot, and make them good. Having two good serves is much more effective than six mediocre serves. The obvious candidate pairs are backspin/no-spin, or...