Remember a proper fitting bike will be one that you have to get off the seat at stops, typical answer to a close to uncomfortable top tube is to lean it over a bit when stopped.

how are you setting saddle height? My go to is to do an initial set based on heel on pedal axle with knee locked, from there if you hips don't rock when pedaling, keep raising until they do, and then lower a bit.

Looking at the amount of seat post you have, i thinks this is probably not a bad fit and you probably don't need to go down a size