Yeah your right. McLaren have admitted they played it to safe, and its a shame that Ferraris wind tunnel problems hindered them for so long.
Out of interest, have Ferrari sorted out their wind tunnel problem and are they still using Toyota's wind tunnel?