As above, this is definitely about your lens collection, if it’s significant there’s no point in moving systems.
But if not, it’s a very complex question.
But if staying with Canon makes sense, I’d definitely be thinking of an R7, if not this time, then definitely the next.
In fact; if you...