That's a pain....I've been there too!
I got my type 2 pump from Angel Homebrew - powerful but still relatively cheap compared to some of the chunkier options. I've just checked though and they are out of stock
I've heard good things about this pump
http://www.kegkingdom.co.uk/products/brew-pump-3000 but no direct experience.
Despite upgrading I never had any issues with my cheapie pumps - brown solars or the black plastic versions. I just figured that given the bits of grain etc it was probably worth spending a bit more for something a bit more powerful.