I carry a Fuji X-Pro2 with the 27mm pancake in my bike bag. Love this combo.
My second option would be the X100.
Have just returned from a safari in Kenya where I used my Fuji X-T2 with 14/2.8, 35/1.4 and a 55-200 zoom for both stills and video. This was the only time in the past decade that I used a zoom. It all depends on your way of seeing and preferred angle but I am most comfortable with primes. Plus I love the higher end Fuji bodies as all their controls are on the top deck and I almost never need to dive into menus.
sorry to hear you did not like the Fuji X series; their colors are spectacular, as is the Fujinon glass. I used to be a Nikon guy until I tried the original Fuji X100 a decade ago and never looked back. Have 4 Fuji bodies now.