I have to say I probably I agree with Video Collector. It's more work, but it seems like the best option for a complete watching. If you felt so inspired, you could include both versions or the parts where they vary on the bonus disc, but I'm okay without that. I simply lean towards the most complete episode in spite of slight visual differences.
As always, thanks for your continued effort.