To me this is starting to sound like 1 of 2 things:
- Yamato is a good guy and he's becoming Strawhat material (being an ally for just this arc, yet introduced this late would be extremely weird for Oda). The fact that he's apparently waiting for Luffy supports it.
- He's entirely conning Luffy into doing something stupid.