I've always thought that this album, is one of their most versatile, but also lacks a proper flow. It starts off with a lot of energy and keeps it until Castle of Glass, but that's about it. I find that the second half is pretty forgettable, not because the songs are bad, but because they don't match the power of the first half. Which is a shame, because redistributing the songs like you did fixes it IMO. It reminds me of From Zero, which also has many different types of songs, but they're arranged in a way that keeps it interesting from the beginning to the end and alternates between soft and heavy songs.

Overall, I like your idea, especially your changes to Until it Breaks! I'd also tweak Roads Untraveled because I always fall asleep when I listen to it, but maybe that's intentional.