First of all, let me say sorry for your loss. I hope you're doing ok with everything, and hopefully Wake should bring forth some opportunities for fun and ways to carry on a good tradition.

As far as the X goes, I'd say do whats best for you. If you look at the X, I'd do what "feels" right. I'm a believer in "if its meant to be, it'll happen". Just keep in mind, you'll probably end up driving a lot more friends around with the X than the Z
good luck with whatever you choose.