There's no excuse for them not to go that angle on the next tour, but there really just isn't room in this tour's setlists. Between the early stuff and JT quickly running up to 20 songs and then the planned encore that they're currently working on in rehearsals, there just isn't much room.
Hopefully the Songs of Experience part of the next tour won't be so tailored to "telling a story" for the first ten songs and focusing on so many visual gimmicks along the way. Just a lot of repetition for anybody that attended multiple nights and was basically just twiddling their thumbs until U2 hit the B-stage and could surprise (or at least play a tune that wasn't being played every night). I mean, obviously they were subbing out Boy-tunes, for example, in the #2 slot early in the set, but it doesn't really change the atmosphere in the room if it's Out of Control one night or The Electric Co. the next.
If they don't get so stuck in having everything heavily choreographed and focusing on the damn video screen which I thought really added little to the show, then we might actually get some wild setlists for once. They played more songs on the last tour than on any one previous, it's just problematic that they played the same damn 19 songs basically every friggin' night.
tldr; They need to just rehearse a bunch of songs including Pop ones and basically have a much wider range in setlist variation over multiple nights. Or, hell, go for your similar story-telling each night but sub-out Desire for Angel of Harlem over two nights or Gone for Elevation, etc.