Go smaller. The thing with compression shorts/tights is they will feel very tight in the waist. Ditto for the tops.
They should feel comfortable, but tight. And yes, any fat you have will be pushed up from the hips and down from the upper body. If you don't have a muffin top in compression wear, you're in pretty good shape
