I posted our solution in the other thread for this, but I wanted to post it here also.
We came up with a solution that uses Populate Anything and a snippet that adds diff merge tag modifiers.
David made a video walking through how everything works.
And here’s the snippet. Just copy and paste this into your theme’s functions.php file.