Defo, nogi in the X-Games would be awesome.
http://www.ChrisReesAcademy.com - http://thetattooedchimp.blogspot.co.uk/
I also believe the Olympics has been bad for Judo.
BJJ doesn't meet all the criteria but I agree that submission Grappling will eventually appear via Wrestling.
BJJ at the olympics will never happen. No-gi submission instead of one of the wrestlings, maybe.