You still have a good theory toonice714, Don Flamingo may be out of the kidnapping business but he still has connections to the Gorosei (or so it was implied when he killed Geko Moria; which hasn't been confirmed) and they certainly are interested in the ancient weapons as it was seen in the Water 7, and Enies Lobby arcs.
Still think he was talking about Black Beard though, just a feeling, nothing to really substantiate it.
Edit: add on content.
There will be certainly a lot of confrontation in the New World, but I think it would mostly likely involved the World Government and Big Mom for now. Sakazuki wants Luffy dead which was shown during the war with White Beard, remember he said he doesn't care if every other Pirate escapes as long as he kills Luffy and Ace. If that still holds true, now that he is Fleet Admiral and with his sense of Justice, I don't see anything really stopping him from pursuing his statement. The only thing he really has to fear is Shanks and Dragon. Luffy declared war on Big Mom, so that is going to happen As far as the revolutionary army is concerned I don't really see a clash there, since he is Dragon's son and everyone knows it now and if they are anything like Kuma and Emperio Ivankoff don't really see much of a clash there. Unless he interferes with them or someone in the organization has different ideals than Dragon, remember Robin spent two years with them.
It certainly holds a lot of possibilities for awesomeness, I hope it is all presented in a manner befitting One Piece.