Lenses almost always beat bodies. I went with an X-T1, because I don't have the lenses yet. Once the lenses I need are in place, I may go with the X-T2. I will most likely wait till there are good used ones for a lesser price.
I would love to have a little faster focus, but only place I've seen this is trying to get the limited depth of field shots of pets looking up. Sometimes, I'm 1/4 second too slow with the whole process. Not sure if the X-T2 would help or not.