I have a 2015 6 and just did a drain, drop pan, replace filter and refill. I measured 5.5 quarts coming out and thatís what I put back in. Checked it while running and level was perfect.
I did similar, but didnt measure what came out, just put 5.5 q back in. It ended up on the high side, but im not going to worry about it. To drain some would be easy since the pan has a plug in case anyone else ends up in this predicament. make sure you warm it up and shift through all the gears before taking your dipstick reading