Well, best of luck deciding. Taking that last sentence perhaps a little too literally, I'd recommend the iPod -- smaller with smoother corners.
I'm sure there are lots secretly hoping you will, so they can buy your N810 at used pricing, and hopefully fix it with Diablo this summer. You might want to consider waiting that long, if your wife won't kill you first...