I am not sure about Buggy, after all they already met at Marineford, but he will for sure meet Luffy again (at worst Shanks will be killed soon before he could keet Luffy, but knowing Oda that is quite difficult) and I think we will eventually have that fated Shanks vs BB fight (maybe soon before Luffy is about to meet Shanks..).