How can you add a Saved Location to a Course?

I typically create my courses using OSMaps, then load them into the Garmin Connect website, remove any unneeded waypoints and manually add course points - such as peaks, overlooks and so on.

Often when I am doing a course such as a scramble, I save a key location - such as the exact point that a rock climbing route starts, or an essential way-point (e.g. "Rowan Tree" which might be a key point on a climb to traverse left, "Pink Rib" as a point to aim for on a butress).

I would like to be able to take these saved locations and add them _back to the course_ - so that on the 'Up Ahead' I can see that (for example) the Pink Rib I need to aim for is on the map.

I've not found a way to do this - I can still see the locations when on the map, but the number of locations I've got is growing and hard to manage, and if I share the course with a friend they don't get the saved locations.

I've tried:

1. Adding as a GPS location in the original OSMaps - doesn't work as can't add a GPS location

2. Adding as a GPS location in Garmin Connect - doesn't work, same reason

3. Garmin Explore Web - seems the closest as I can see the saved locations but what is a "Course" in this site? Is it a "Route" and don't know how to add a named GPS location to a course

I guess the last option would be a more dedicated GPS file editor, but I'm not sure which are good and whether there are any that can export Course Points in the way Garmin needs them - does anyone have any ideas?