Jirachi will probably make uber because it doesn't have as many legendaries to compete with. Its typing is excellent as well, even without the addition of light type immunity.