Ok, first off, if you want to keep these two cores you need to add a reliable fairy switch in. Magearna and all the Tapus destroy your team.
Changes keeping the core:
Jirachi -----> Ferrothorn/Celesteela: Jirachi is cool and all but you need more bulk than just Clefable. If you go Ferrothorn...