First, I think you can fit landorus-therian>jirachi-it gives you a good ground type that also sets rocks and can be offensive or defensive. Also give you another good ground resist.
second, leftovers>rocky helmet on rotom, gives rotom-w passive recovery as rotom-w has no form recovery out side...