Yeah I think Todd would work. If not a fighting gym though then what? I think a dark gym would be a decent addition to the list, in fact I don't think Layla should be removed and should replace fighting and then have ghost move into her current position.