Thanks. I guess if Cervelo are being a little(!) sneaky with their definitions, then that makes sense. Iincluding effect of their new bars I can accept, but wheels - that's sneaky - they may as well go the way of the Venge and include supplied shoes!
So sounds like I'm best getting my S3 repaired. I run it with 3T aeronova bars anyway, so that probably takes me back to the original 4W difference I had with the old S5 (if all the marketing is to be believed).