The benefit of dedicated macro lenses is that they can focus very close, and achieve a 1:1 or 1:2 reproduction ratio. Based on your existing data (which is cool!), it looks like you're shooting a wide variety of focal lengths, at short focus distances. But it doesn't look like you need extreme 1:1 close up capability; correct me if I'm wrong.

Based on the above, I'd recommend trying an XF 55-200, plus an MCEX-16 extension tube. It will accomplish two things: first, your longer focal lengths will be served by the 55-200, but the macro ring will give you the close focus you require. Second, if you have a wider lens, such as a 27mm pancake or either of the 16-50 or 18-55 kit lenses, the macro ring will work with them too. It will have a dramatic effect on their focusing range -- 16mm of extension will make the kit lenses almost unusable on the wide end, but the mid-to-tele range should be able to get pretty close.

You will end up with a very versatile zoom plus a macro ring which works with any lens, for $100 more than the XF60mm macro lens. If you can easily rent this combo before you buy, that's a fantastic approach. And if you're willing to use third-party macro rings, it's $40 for two instead of $100 for one. (That's your decision; personally, I like my Fuji brand.)

Fujifilm publishes a very handy table of focusing distances, with and without macro rings, for all their lenses, here. My advice: don't get wrapped up in maximizing the reproduction ratio at all costs; just figure out what would give you the best value per dollar.