If I were forced to choose...I wouldn't.
I really like them both, but I use them for different things in different places. Not sure which I'd give up first, especially if we're talking about a Mini with an updated display that (hopefully) still has decent battery life and sound volume. The 2GB of RAM is great, too. Not sure I'll take the hit and upgrade but it's tempting.