If the idea is that Yamato stays (Ala Jinbe at FI), has a Wano cover story after Germa, and then subsequently joins the crew when heading to Laugh Tale and the final war, then that's honestly fine. It should be "too" long before that happens (or so we know).