That swap would work for me!!
I don't know about those two opening - too much fuzzy guitar Seriously, though, I think American Soul will be more of a centre-piece song on this tour (even though I find the lyric lazy and tiresome.)
I was fortunate enough to catch A Sort of Homecoming twice on the last tour. It might work better in a smaller space where - possibly - most of the fans are pretty hardcore (I'm just going on the serious money these tickets are costing us.) Such a great song.
And I hope SoI is represented by a song other than The Miracle. Iris is still a moving song for me, and Raised by Wolves is a good rocker. And I love the stripped down EBW - I think it is a great song for highlighted Bono's vocals.