Those are both concerns I had after the gig I went to when talking about her Glastonbury headline potential. The middle filler bit can be dealt with by doing slightly less of the slower songs and replacing them with a guest.
Very little can be done about the fan thing though, so it'll be different in terms of crowd reaction. Will be interesting to see how it goes