Shanks DOES NOT want Luffy and BB to fight each other. Shanks strongly believes that dealing with the traitor Teach is his responsibility and the promise to his captain can only be fully realized when Luffy becomes the pirate king. Shanks knows that Luffy chooses his own path and fights his own battles but Marshall D. Teach is the sole person that Shanks will make sure Luffy never encounters.