That sounds like a very fun mini.
Personally I'd do the swap, especially if it doesn't need money, then keep the Mk2 till you've moved (you'll be grateful of the hatchback's size), then flog it to one of us for decent money and keep that nice mini going.
I'd love a mini, but it's not so practical when you're a 6'2 guy with a drum kit to take to gigs. (Similar problem with Bugs)