I think it's time to start the setlist from scratch tbh. Start with the classics that have to be included then whatever she truly wants to perform. Create interesting arrangements and mash-ups that will surprise us. I think as a whole her concerts need a total revamp so whatever mood/production they go for should complement the music choices
edit: idk how she would do any concerts this summer with Valerian going on. Maybe a festival show but yeah...