Sorry, TF's support of waypoint commented routes is pretty limited. You've hit the two biggest limitations on the head. Unfortunately I can't think of a way to assemble such a route *and* upload it properly in TF. It's my fault -- I just use tracks, and have never thought of using waypoint routes. But I can see some advantages... Sorry.