AFAIK it is stated somewhere that the general consensus long term is a variable block size, but that requires a lot more research and testing.
I think we'd also have to start slipping nodes a few satoshi's from transaction fees if something is implemented that makes the chain excessively large.
As always, research and testing should be done to the max.