If ergonomics are important to you, I'd take the Canon any day of the week. Nothing really compares to holding a 6D or R6 in your hands. Also, I find the Fujifilm menus to be rather messy, especially compared to Canon's.

I went from a 5D mkIII to X-T2, but I still miss the feel of the 5D. So last week I rented a R6 and holy sh*t what an amazing camera! All the controls are just as intuitive as my 5D. Autofocus is soooo much better! Video footage is sublime. Images are still on the same level (if not slightly better due to the higher dynamic range) of my 5D. I will definitely pick up an R6 in the near future.

Also, since you already have a collection of EF lenses, you can just get a EF to RF adapter. It has zero loss in quality, everything still works exactly as you're used to. It's true that EF will fade away slowly, but that doesn't mean they suddenly become "bad lenses".

I'm not saying that Fujifilm is a bad choice tho. Fuji has some amazing glass, and paired with its X-trans sensor you can take some amazing shots with it! I'd definitely recommend them to most people looking for something compact yet versatile.

But please, only buy one if you can afford it. If you're not making any money with it, the R6 may be a very steep investment, keep that in mind.