Also, i work on both. and we have replaced hundreds of t-23 laptop drives. I absolutley would wait. The only minor thing that i dont really like about the t-40 is that it does not come with a FDD. For a user these days that is not a problem. But from a technician POV they are helpful. But the machine is about twice as fast. wait wait wait.
I would wait.....it's worth it....just forget about it (good luck doing so) and when 40 days is up it will come in the mail, and you'll be like...."when did i order this?"