For starters I think Candie's reaction to their deception should have been harsher. Certainly not just give them their girl (even for the inflated price $12,000 is chump change to rescue your lady love especially when they spent all summer earning $7,000 or more per bounty) and ask for a handshake.
Once Candie realized they had the cash on their persons he should have given them *Eskimo Joe* since that was what the original deal was and refused them Bruunehilde. That could have kicked off an altercation which still leads to Schultz dying and Django captured. No NC-17 ***** grabbing crap or scrotum shots though, that alone ruined the movie for me.
Maybe Django and Eskimo Joe get carted off and then the rest plays out similarly to how it did in the movie, with Django and EJ being the new "Schultz and Django" and storming the castle Siegfried-style to rescue Bruunehilde instead of being forced to do so because of a botched handshake. I'm not saying that's the *best* resolution because really these things take weeks or months to hash out (and Tarantino certainly enjoyed more story tweaking time than the day or two I've thought about it) but that's just one way I feel the conclusion would have satisfied compared to the buildup that came before it.
Django helping the slaves in the wagon would be "paying it forward" for what Schultz did for him at the beginning and him taking EJ under his wing would have some semblance of making up for letting the other man be eaten by dogs.
