Personally I think the FIA should take the tyre choices away from Pirelli and figure out a way to put it into the hands of the team. "Here they are, pick two". I might even go as far as far as allowing them to gamble by trading wet weather tyres for primes before quali. If it rains and you gambled, you're screwed!
While I am far from a Pirelli fan, if the teams made the choices and the tyres didn't give the desired result they would have to assume a large part of the blame instead of always directing it towards Marbot...er I mean Pirelli.