Barcelona are really ready to do whatever is needed to keep Messi at the team. Laporta is still keeping his hopes up about him. But I've a feeling like he will leave the team anyway. And I think he needs new adventures at a different team.
I think it is not going to be that hard for them to keep Messi this time. Last time Barcelona had a president who paid other people to bash him on social media, it is obvious that he wasn't really liked by the players. How could you keep playing on a team when president of that team pays people to say bad things about you? That would be impossible to ask someone to do.
However currently there is no love lost between the management and Messi after the change, new president likes Messi and supports him and basically gives him the key to the kingdom, so I think he will stay. If it was the last president we wouldn't have Barcelona fighting for a title and we would definitely see him leave as well, but with the current situation I believe he is going to stay and he will not leave anywhere anytime soon neither, it is going to obviously be much better.
The team need to prove Messi that they really want to get the Champions League title also. And they can show it by bringing more qualified players to the team. You can't expect Messi to be eager for continuing to play and fight for the title with a lineup like this. If they strengthen the lineup, I don't see any reason for Messi to leave.
Otherwise, it will be better for him to leave Barcelona for much more powerful team.