For me, yes I think it should be totally abolished, I don't think it should ever have been brought in in the first place.
No male should have a female mark in their passport or on any other identity document.
If a Gender Certificate is wanted/needed it should not change the details on the Birth Certificate but be an additional certificate stating the person is trans.
Additional boxes on documents and forms to record whether the person is trans that are n/a to those who are not.