The 2GHz Pentium 4 should be out at the end of July or August, but it is still the Socket 423 Willamette version.
The Northwood Pentium 4 should be out a little after that.
Depending on how desperately you need a new/faster computer, I suggest you wait a little bit longer.