Either is going to be a massive step up. I went 6D to R6 mk1.
I'd really go R6 3, R8 2 is another R6 2 rebody, and it (the R6 3) just seems to be the best all rounder at the moment.
Primary gains personally would be the bonus cropping, the better EVF, dual card support, 1/8000 mech shutter...