I hear ya.
It appears the TP2 will be out soon, from what I have read. And the Diamond2 is no where in sight.
So if you want a Diamond, ebay or similar or wait for the TP2 as you suggest.
Another choice would be to change the vibrate motor on your Diamond.
I started a thread regarding Diamond Disassembly, which may be of help to you.The thread includes links to sites regarding parts and service.
Here is the thread >
http://forum.ppcgeeks.com/showthread.php?t=77666