Here's another printer to add to your list - the HP 9800.
It's a cheap version of the 8750, using the same inks. SRP is $299 I think.
Look at it this way... It'll do most of what you want right now with only a small investment. Then, if something does come along in 6 months or a year, you can easily upgrade. Perhaps even keep the 9800 as a dedicated B&W with the 100 gray cart.
The major knock against the 9800 compared to the 8750 is that it only has spots for two ink carts at a time (8750 has 3). So, if you are printing colour photo, you have the two colour carts in. If you need to print B&W, you have to take one out to put the gray in. This also means that colour prints can't take advantage of the grays, which does help some.
You are already familiar with your 7960. The 9800 or 8750 will be very familiar to you, and will work with papers you are already using. Plus, the 9800 is already in stores.