When you do upgrade, an Endli will make a good match in size and temperament. Dats would make a good match as well, however, they do grow slow. A Prochilodus would also be nice, but I've heard of them sucking on slim coats (especially on Polys), but I never had that happen with mine as long as you feed it well.
