No.
And no. I have zooms, I have primes, my most used lenses are manual focus TS-E primes, when I get an R5 it will be accompanied by the bargain 35 and 85 primes. But that doesn’t change the numbers, nor the economics when looked at from Canon’s perspective, as I said, I doubt we will ever have the breadth of lenses in the RF line we had in the EF line not least of which reasons is because it spanned such a developmental era of the camera industry.
The FL saw little comparative change, the FD went from the FL manual everything to auto aperture with a single failed stab at AF. The EF went from 135 format film through three different sized digital sensors and pioneered fully electronic communications, step less apertures, leading AF and IS, CAD, more development in exotic glass and molded aspheric lenses than you could shake a stick at and is current and world class even now three decades later.