X-Pro1 > X-Pro2 Upgraders...Opinions?

I've used an X-Pro1 since it was released...I absolutely love the camera, especially the look of the files...mainly the beautiful colour. I think the colour output of the original X100 and X-Pro1 are perfect...but the AF hit rate on shallow DOF portraits is killing me...I do a lot of travel portraits where you don't get a second chance...I have to get the shot in 3 seconds or it's gone.

I did buy an X-T1 but it sits on the shelf unused...I dislike the ergonomics, the DSLR form factor and...

X-Pro1 > X-Pro2 Upgraders...Opinions?