I'm also putting off other purchases (including a standalone GPS) so that I can upgrade to a Raphael/TouchPro. Although if the wait is more than month past the release of the Diamond, I might just go with that.
I'm getting sick of flashing different builds of 6.1 on my Apache.