On Every Street is an iconic and an all-time-dire-straits-masterpiece. The second half with the build-up is essential in terms of the lyrics. It's one of the best recordings, speaking about the album version, and it's very much because of Paul Franklin's contribution that it is so good. Live it is really another story. Neither the 2015 versions weren't good because Nigel just did not nail it nor this year's versions. It's a bad choice to resurrect this song of all things.
And I agree that Heavy Up would be perfect for this band and I think it should replace Postcards From Paraguay as the introduction song. Everybody is soloing so nice on the record, this could be expanded very nicely and make the crowd sing along live.
In 2013 they played Dream Of The Drowned Submariner a couple of times and that one was very nice and would have a much better sax and guitar interaction than On Every Street.
LE