Thanks everyone for all the tips and insights to improve my workflow and success rate.
I do these when I take a stop anyway and if there are no waypoints around, so I think pre-pare is not efficient, it will have to be post-pare.
I think upload later and then after upload putting them on hold is going to be useful, I’ll try that.
And I think quality of waypoints submissions and way point selection can also improve. Better to go for named trails. I typically use OSM, so I see named things.
I’ll appeal the survey marker, and abandon the other ones, I think.