I voted buy the K20D over the K7D, even though when faced with a similar dilema in may, I bought a K7D.
Here's my logic
When I look at your lens list, everything is relitively new. OK you have an A 50mm F1.2, but that is the only MF lens and all the others are FA or newer designs.
In addition you have the BG and the grip and batteries are the same for both cameras.
The K20 also gives you focus adjustment if you need it, and for you that is pretty much the only benefit over the K10.
the other things the K7 gives you are marginal at best.
Now, on the other hand, while I have several really good zooms, (Sigma 10-20, 70-200F2.8 and tamron 27-75 F2.8) I also have a ton of manual focus K mount and M42 primes.
The K10D (and the K20 is similar in this respect) performs very badly indeed with Manual aperture lenses, and needs exposure compensation when I use a TC on the sigma 70-200.
As a result, when my K10 needed a nes shutter, although i sent it for repair (because it is still a very good camera) I went for a K7 instead of the K20 because I wanted not only the higher ISO capability, but also vastly iimproved metering which the K7 has. As opposed to -1 +2 stops of error with MF lenses on the K10, it is less than +/-1 stop on the K7, I no longer need exposure compensation with my sigma 70-200 F2.8 when using a TC and metering with my 300F4 and 1.7x AF TC is spot on as opposed to 2 stops out and no provision on the K10D for exposure compensation in manual.
each case like this is different and needs to be viewed on the basis of what you own in the system, and what you intend to do.
By the way, my argument assumes you can affortd to buy the new camera