If you crop "quite a bit", then maybe the R5. Full frame, full rez, 45mp is often much more than I need.
I like the 30mp range as I don't tend to crop much. I recently sold my 5D4
for an R5 only for the joystick over the original R, not the resolution. (I've become a mirrorless fan for the size and focus peaking with my kit of MF lenses.) I also just picked up a Leica Q to see if I'd like it enough to score a Q2 (and I do!), and barely gave the 24mp a second thought. I haven't cropped anything off those files, as the way I shoot it is 100%.
If you habitually crop, go for the extra resolution.