Yes, but voting the return proposal cancels out the vote I cast on the proposal(s) I want to support, while downvoting all other proposals.
I don't know exactly what should be done to better the HPS I confess. I just think the stake-based voting on long periods of time is too open to abuse with too little control over the work that is done. Same for witness voting. It seems a bit like (except with the recent hostile takeover) only people who have interest in either are voting. It's all going back to stake-based voting in fact.
People who got the money are the ones able to make even more.