Jumping on cameras is typically not recommended. I know it's cool to have some wear or brassing on your camera, but let's get there without the abuse. Hmm... unless the new X-T2 is rumoured to be jump-resistant? Do we have a trusted source on that?
X-T2 for me, I would think. Though, I have not put an X-Pro1 to use, so can't really judge my thoughts on it. I'm just completely besotted with the EVF and now that I've gotten used to it, there's no going back (as much as I do honestly love a good rangefinder). But, realistically, the risk of divorce increases exponentially with the shortening of release cycles, so it may be an X-T6 or X-T7 for me. Well, that or a life of bachelorhood, cameras, and loneliness.