collie x for me. But if I was in your situation, I'd make the most of the dog you have now. Put the time into working with it and learn along the way. You'll be in a better position to choose your next dog in a few years time.
And remember, beware the man with one gun