Shanks ended the war simply by being badass. Well kinda, you can watch for yourself, it's the end of episode 488 and then 489.
While it's true that the Davy Back Fight with Foxy did add some filler, what you've mentioned of it was not.
Afro Luffy happens in the manga. Episode 217-219 in the anime. I'm surprised Extha can't remember. That fight with Zoro and Sanji working together happens in the manga too. Episode 211-213. If you wanna watch the whole arc it starts at 207 and 213 through 216 is filler.
And a streaming site you say? If you live in the US you can watch all episodes subbed legally at: http://www.funimation.com/one-piece
--
Easiest bracket ever, yet we all failed!
Well except SuperNiceDog, of course!