I do think this modified scenario makes the solution much clearer. At the same time, I also think that it feels like a significantly-enough different scenario from the original that saying the two scenarios have the same probability then becomes the non-intuitive part. The act of revealing what's behind the second door seems like it should change the probability from 1/3 (one door) vs. 2/3 (one of two doors) to 1/2 (one door of the remaining unopened two) vs. 1/2 (one door of the remaining unopened two, since one was "eliminated").

It's amazing how even seeing the probabilities written out, or running simulations, doesn't really make it easier to truly understand the result.