Get a new EF camera body or an extra EF lens before they are gone?

Get a new Canon EF camera body or EF lens before they are gone? What are your thoughts?
I would prefer 2 maybe 3 more new EF L lenses. My lens collection will be complete and finished for a very long time.
I will may buy more Tamron lenses. My two new G2 lenses are supposed to work with mirrorless. I didn't get burned.
When a Canon mirrorless camera grip fits all 4 fingers on my hand comfortably I'll eventually switch over and no sooner.
Once EF repairs can no longer be made I will consider switching brands and never look back.

You have at least five years to do so.

...and then there is a very heavily populated (with used gear) market, even after Canon no longer builds new ones.
Same for repairs...the independent shops fix things for a long time after Canon stops fixing

A couple of months ago, I bought a pair of 5D MKIVs (Canon Price Watch). I have plenty of lenses. With luck, these will carry me for as long as I want to photograph.