After a bit of research I decided on this reasonably priced machine from my usual component supplier up in Watford. It should be with me on Friday.
Then of course comes the joy of migrating applications and tools to a new machine. I suspect I should make a list of what I use regularly, and use that as a place to start...