The fight was going on for a while, it started in chapter 1015 and it got resolved in chapter 1034 and no the conflict was not forced.
Everything about the fight made sense and the fight was espcally good in terms of focusing on Sanji's character.
But it seems like you ignored everything because of your hatred for Sanji.