No point in removing THINFS songs from setlist unless you want the tour to be "Greatest Hits" or "Nostalgia Band".

If I was Jon I would add some songs such as The Distance, Nobody's Hero, I'd Die For You to the set, longer set.
Somehow I would make the setlist be for BOTH casual and actual fans.