Raid rematch button in Tower

Please add rematch option for every opponent in Watchtower.
Sometimes I raid other players with one last energy and lose. By the time my energy refills, system seems to forget that I chose to rematch and offers new opponent. It would be a lot easier if we had that rematch option in Watchtower, like we have revenge, for the ones that attacked us.