I'd take my battery meter being slightly wonky to get your SOT. I show 100% when fully charged but only for maybe 5 or 10 minutes tops before it starts to drop. So if your getting 5 1/2 hours SOT that sounds pretty darn good. I recall awhile back your complaint was really much poorer battery life and way less SOT. Your S6 sounds great other than the meter. I have OCD and while stuff like that bugs me I think you got the better end of the deal. So maybe don't look at the meter when you unplug it and enjoy all that power to spare and you'd never know.
I literally have ocd so at least you understand my pain xd