Nikon D7100 user looking for travel/daily use camera.

I have a Nikon D7100, but would like something smaller for travel and day-to-day use. I find that my Nikon is cumbersome to carry with me to informal family events, and I have gotten somewhat "lazy" and have been using my Samsung Galaxy 7 Edge phone instead of my camera.  Image quality is important to me; budget is somewhat flexible, but I think I would like to stay under $1,800CA.

I recently tried a Fujifilm X100T and I really liked the small form factor as well as the external controls. I pondered whether to invest $1,600CA in a 3-year old fixed lens camera, and eventually decided to wait and see whether a new model will be released in the next year.

I am now leaning toward an interchangeable lens camera, and am considering the X-T30 or X-T20. I have tried both cameras in-store, and have reserved an X-T30 for a 3-day trial in about 2 weeks. Also while in the camera store, I was shown the Sony A6400 which I was told has excellent autofocus and image quality. However, many people have also told me the Sony menu system can be challenging to navigate.

I've done my research online in so far as spec's and comparisons go.  I tend to purchase the most current technology available, but there is a $500CA difference in cost between the X-T20 and X-T30, and I would appreciate your input as to whether - in your opinion - the X-T30 is "worth" the higher cost (I know that value is subjective).

I can purchase the following kits at my local camera store (all prices are in Canadian dollars):

(1) X-T20 with XF 18-55mm f/2.8-4.0 R LM OIS: $1,200

(2) X-T30 with XF 18-55mm f/2.8-4.0 R LM OIS: $1,700 -- or a demo model for $1,580

(3) X-T30 with XC 15-45mm f/3.5-5.6 OIS PZ and extra battery: $1,300

(4) X-T20 with XC 15-45mm f/3.5-5.6 OIS PZ and XC 50-230mm f/4.5-6.7 OIS II: $1,500

Thank you for your help.