Should I wait to upgrade?

[Centurin]

According to this X-Bit Labs Article, Intel will be releasing new CPUs with Bearlake in Q3 2007. I plan on doing a complete PC overhaul at the beginning of the year. I'm worried that if Intel changes the socket on their new chipset, all my upgrading will be for naught. If, however, they keep the same socket, all that will be needed is a motherboard change. Should I wait?