Waypoints files have nothing to do with CSDM (except CSDM is spawning players in some uwaypointed areas). All You need is to find better waypoints for those maps or find somebody else to make/fix these waypoints for You.
Maps You pointed out aren't standard ones, so waypoints for them aren't included in
Fullpack nor in
All-In-One.