Well, I'd say
-1 rufflet, as 3 ho ohs and 4 rufflets make no sense. just more bait for darkrais...,
-1 Rayquaza, its great and all, but if you are aiming for ho oh, I'd try something which doesnt rely on switch too much.
+2 crushing hammers, if you have enhanced hammers, you can always add...