I was thinking the Hobie Tiger, if there is to be a olympic multihull again. My reasoning is from reading the selection criteria years ago and the following:

It must be a ISAF international class.
It must have double trapeeze and spi
It must be a OD class
It must look flashy and modern

Only the Hobie Tiger qualifies today, and I dont think that will change much in the next 8 years.
Sure there might be an evaluation event, like in 2000 and like the youth multihull, but in the end ISAF Council decides whatever the committees and sailors say. I think the "fat old men in monohulls" will choose conservatively if the door opens for a multihull again. Just my personal prediction.
I would be very happy to see the Tornado class back in the games for many reasons.