Get the switch fixed first. Doesn't matter how many owners or if you're out of warranty--its free. Then do the upgrades.