Mika said on Sunday that he's not returning to F1. I reckon he'd be up to speed given a week or 2's solid testing.
Kimi going to Macca's not a bad move, as Ferrari don't seem to be moving forward and McLaren are on the up, especially with the current car. Provided they don't make a dog like the 2006 car, they'll be a real contender.