CMill I would suggest people to have different locks on their stack to prevent these type of situations.
Regarding the proposal itself:
I think it is a good proposal as it addresses multiple issues at the same time:
1) APY reduction and by the same effect Runway Extension
2) 3,3 has a bigger impact with locks
3) Low Time preference behavior is encouraged
4) People get to choose what they want to do. Even if you don't want to lock you get rewards.
I hope that the community will be able to rally behind this proposal and that we can put all these staking/APY discussions behind us and shift our focus back on building.
(3,3)