I would go with Michelins or Continentals. Agree that F1's are pants in the wet and to me don't have the same dry grip either, always makes me wonder how they win these tests.
Anyway, Mich. PS2's are very good tyres. Have ContiSports Contact2's on my 911 at the moment and they are good but think the ride quality is better on the Michelins, also seem to last longer. Not cheap tho.