Just a random thought: Have you considered approaching your LFS with some of your stock rather than consolidating it, so you could have more of what you (might) want for your new scape?
I only ask 'cos with hindsight, I'd like to try less species, more members in my community tank. A bit like...