I have the HD Tivo myself and I love it. I think you will too if you go that way. Only real complaint I have is slow menus and guides. Otherwise it works very well and the OTA HD tuners pull in channels my 2 previous units did not even see.
Only thing you should consider is this: I agree that D* will upgrade our older units at no cost, but that will not happen until the MPEG-4 locals are in your area. I'm not in a top 30 market so it will probably be a few years before we get the HD locals and therefore a few years until I get the free upgrade offer. If you are buying now expecting the upgrade soon, check your market. You may wind up waiting for awhile before you get the offer.
"We are only immortal for a limited time." -Neal Peart