I'd suggest the K-5 if you stay with Pentax. It's brand new out and full of excellent technology.
Nikon-wise, they've been sticking to the lower resolution/lower noise theory until very very recently. The D7000 is the only real Nikon upgrade to add a significant degree of resolution, but it's over £1,000 so it's a HUGE step in price as well. The D90 is excellent (I use one for landscapes and it's great - there are a few
here) but it's only 12.3MP.
For your money, the K-5 is the best option unless you really really want to shell out for a D7000.