We're going to draw the roads and paths in our example first, then add the point features after that. Between the GPS trace, the named waypoints, and the photos, we have enough information to start mapping. Normally, you should download any existing data from OpenStreetMap and add your mapping to that, but we're going to assume that this area has no previous mapping at all.
We're going to start by drawing the roads on the map. You can use any of the editors to practice, but please remember not to upload your data to the server, or you will duplicate existing data. Choose whichever editor you like the look of, or even repeat this exercise with each editor to get a feel for them.
Whichever editor you're using, make sure you have our example trace loaded, and for JOSM and Merkaartor, load the images. You can still use the images as a reference if you're using Potlatch, but if you were doing this in a real survey, you'd have to take a note of which photos were taken...