You have a good list but I would lean towards swapping out the bombers for the two guardian warhosts and maybe the windrider swap as well. You'll have more activations and backup for when the void spinners get whacked.