"if you make an edit which is good-faith reverted, do not simply reinstate your edit – leave the status quo up" ... "propose your reverted change on the article's talk page or pursue other dispute resolution alternatives." https://en.wikipedia.org/wiki/Wikipedia:Reverting
I am not saying the policy is unreasonable, but it combined with the interface does discourage people.
As to an improvement, if Wikipedia sees the same edit applied twice it could detect this and walk someone through the policy.