Gaudu said it in l'Equipe a few days ago: maybe it's now or never. The likes of Almeida and Ayuso will only get better. David is right: he needs a team 100% focused on his GC quest. Behind his boyish looks, Gaudu is ruthless. He doesn't want Démare, and knows that Pinot won't be happy in a dom's role.
Madiot was on RMC a couple of days ago, and what I get is that he will wait until after the Dauphiné and he also mentioned a discussion with the sponsors. We don't have to guess: Groupama and FDJ want Thibaut. Sorry Gau-dude...that's how it's going to be unless he wins the Dauphiné or loses by mere seconds to Vingo and GFC decides to go all-in on David. So the pressure is on for him to deliver this week. But even then, public pressure and the sponsors make it a 95% chance that we'll see a feisty Tibopino in July.
The '22 experiment, the happy medium didn't work out, but Thibaut looks stronger now than he was then, and the route offers opportunities: on Bastille Day, the stage ends with Grand Colombier via Culoz where Pinot won several times in the past. Then he can take a semi day off and support Gaudu on stage 15. Then give it a shot on stage 17 and help on stage 20. The tricky one could be early on, the Puy is too big of a prize to ignore. Maybe we'll have a remake of Anquetil-Poulidor

.
I think that the relationship between Gaudu and the team will suffer big time. But if David can't wait another year, and work on his ITT (which is a must for him to be competitive in a GT), he can go to Ineos for all I care.