Don't want to be negative, but honestly I don't think freestyle will ever be in the Olympics, just because..
Every sport in the Olympics has an objective, or a goal you know, and Freestyle doesn't, it is a hobbie, not even a sport. You just do it for fun, you do it for yourself and to entretain people, it doesn't have an objective like the other sports..
I don't really know if you understand what I mean, but if you do, that's just my point of view; but yeah, nobody knows, maybe it will come in the next Olympics, or maybe not.
That's what I think ;)