Rather than making a bold edit that is going to cause edit warring, may I point out a few things as I feel there is issues with this template and would like to make it similar to Template:Main world championships which only lists current championships.
Many of these that is listed under "non-Olympic sports" was at one time a Olympic sport considering cricket and rugby union have been a olympic sport in the past, most recently baseball and softball (now no longer a Olympic sport), therefore do we keep them in the Olympic sports section or is it better to start a section titled "former Olympic sports".
Is it worth including competitions that no longer exists as history have been littered with competitions that come and gone.
As with the bit that states "Olympic sports of which there are no European Championships", is that necessary? May I recommend removing that section as if there is no European championship, then it not necessary to be listed there.