I know it doesn't deal with your major problem, but now that salamence is uber, why not put spin on starmie over ice beam? It can't counter flygon anyway, and I doubt you'll have much trouble with dragonite. This change would up the survivability of your yanmega.