Chris
Take a look at the thread I started here:
http://www.cbfsim.org/cb-bb/viewtopic.php?f=32&t=21208
I'm also looking at the 2500k but I'm not going to buy a motherboard that I would then have to exchange. Some will say it won't be a problem but I'm not taking a chance.
As for that Q6600, it still fetches good prices on eBay. I'm just waiting for my wife to say her new system is definitely ok and that's where the Q6600 will go even though it has more grunt than this PC.
Ian
Edit: A week or so ago, many of the retail sites such as Scan were proclaiming that they had agreements with the manufacturers to provide replacement motherboards when they were available. Based on this, they restarted the sales of the faulty versions.
Now that the justification for continuing to sell the old mobos has been stated,I see any such replacement claims are not so obvious any more. So those unaware of the problems could be buying and not know about the replacement policy. However Scan has very little stock of 1155 motherboards since Intel has stopped producing the faulty chip sets. Others may be in a similar position.
The new mobos will be "B3 stepping" so look out for those - but apparently large numbers will not be available until April. Maybe the 2500k will have dropped in price by then.
). But it's going to be a slow process... first plant the seed at the right time (last weekend) then water the seed with chocolate, cleaning, good food and I recon in about a month I might get my way! 
On the other hand it might all come to nothing 
.
). My other half doesn't generally use the PC but she is quite keen on getting one or other of the various tablets around the middle of the year, maybe that is the time to strike!