I'm also quite tempted with Fuji.
How much your friend got for his Fuji X-T1 and also your X100T?
Get the Olympus OMD EM1. I have both and the Olympus is better. The best part of the Olympus is the touch screen which allows you to touch where you want the lens to focus and it snaps the image within miliseconds.
Fuji does not have a touch screen.
I regret buying the XT1. The lack of touch screen pisses me off.