I had a similar situation - took a X100T and X-T1 w/ 18-55 on holidays. Lightroom stats: 121 shots with the X100T and 25 with the X-T1. The X100T can simply be always with you, delivers a great quality, and the 23mm are a great focal length. If you need more flexibility and can spend the money, you could add the converters to your kit - but I'd say the X100T would cover 85% of your needs.