All sound like good setups. I kept my 3 Canon 580EX II's and trigger them with a YN-622C-TX transmitter and use the 622 receivers. Works great - use it with an X100S and X-T1. Allows for the transmitter to change the manual flash power, groups, etc.
Ditto the comments about Fuji TTL. I've been contemplating the Nissin i40 for an on-camera TTL flash when covering events/weddings/etc. Otherwise the Canon 580EX II's and triggers work perfectly for me.