Replace them with an instrumental (Call of Ktulu, Orion, To Live is to Die, Suicide & Redemption) and a rarer post-Justice song (Struggle Within, Bleeding Me, Outlaw Torn, Devil's Dance, My Apocalypse, etc.) and that would be an awesome set!