With the confirmation of Map drawing around the horizon, waypoints are no longer needed to display information other than where a person should go. For that reason, waypoints should be simplified to only display the most relevant information to you. Put another way, only show the lowest level waypoint assigned to you. If you are in a platoon and a squad, only show your squad waypoint, if you are in a squad and a fireteam, only show your fireteam waypoint. This reduces clutter, and you no longer have to deal with "which waypoint do I need to go to"? Esentially, you should only see one waypoint (not including your personal waypoint).

TLDR: Only show your most relevant waypoint.