import .gpx files with waypoints and routes and create trip for satnav with correct track and waypoints

I have a .gpx file which, when I import it into BaseCamp (mac) shows both a complete track and the set of (say 100 off) waypoints in the folder it sits in. I can create a route (trip) from the track info (fine) but I haven't found a way of incorporating the waypoints as well (without basecamp insisting on creating a new track from the waypoints). The waypoints do not define the shortest route, they are interesting points on the route and using just the waypoints to create a route (trip) will not give me the desired route (which is correct if taken from the track info). Is there any way  of keeping the waypoints and the track from the original .gpx file? Thanks for reading through...