There's a significant segment of the population who don't care about the manipulation, so long as it helps their "team".

There isn't really any way to compensate for it. All that does it encourage voter apathy at best, or at worst, people start to think "both sides do it, so it evens out."