Very well said, this idea is a good one. Realigning incentives do not always need to be removing something but can be making something else more attractive.
I would completely endorse a solution like this. Because pending rewards are relative to the total pending rewards for everyone, giving more rewards for more positive use of stake would in effect reduce self voting rewards.