Replace Tornado with F18 for 2012 and after. Each Olympics choose a manufacturer and race one-design as in Alter Cup format. Rotate manufacturer each Olympics. Give JW a lifetime free rum drink card for all the work he's done.
I think that with time quickly running out the tornado probably would get the nod. I think that then 2016 is when to focus upon new equipment. All of this is speculation though at this moment.