I've always imagined Kili and Fili dying as a result of them defending a mortally wounded Thorin - which is what happens in the book.
So I agree with everything you say, just changing the last part and make Bolg wound Thorin, at which point his nephews will step in to try and save him.
Otherwise, I'm all for it