Ok, here's the thing: Yamato is strong! A lot of people downplay her because she bodies their favorite. But, she is strong, undoubtedly. Being said that, I think she needs to grow a bit with the strowhats to reach to the Admiral level A.K.A to top tier. She's not yet there–although she's insanely close–otherwise Zoro and Sanji would be waaaaaaaaaaay weaker than her. And make no mistake, Zoro and Sanji are indeed weaker than Yamato, but the gap is small enough for them to catch up to her in the next arc–presumably Elbaf. This is not new or out of the ordinary, we've been in this situation with Jinbe, and Zoro, Sanji surpassed him in Wano very quickly, I expect the same with Yamato. So here's what I'm trying to say: yes, Yamato loses to an Admiral in 1v1, but she's not going down easily, she'll put up some fight (unless Oda wants to use his pis pis no mi again) and might very well push an Admiral to high diff before losing. But, regardless of the semantics of power scaling (in which I don't believe, as you already my know) the Greenbull issue will probably be solved diplomatically, thanks to Momo's not so subtle destiny to become the best Shogun of Wano. So, the fight will end with no conclusion...