Campaign Navigation: Act 3 (Normal) back-tracking Oversight?

Jumped back on an alternate character (Level 65- starting maps) to catch him up to my other builds. I noticed he was missing the +'X' Spirit from an Act 3- Normal side-quest/optional boss. So I used the Act 3 Cruel town way-point to go back to the closest zone I had active which was the "Infested Barrens" WP (Act 3 Normal). Ran through the zone and into the 'Azak Bog' zone, grabbed the way-point, ran through and killed the Bog Witch. I applied the bonus Spirit points and hopped through a portal to town. This takes you back to 'Ziggurat Encampment' which has no Way-point (In the Past[?] version of it). If you go through the 'Gateway' it takes you to the Act 1 Cruel starting area 'Riverbank', a portal from there takes you back to town. To get un-stuck you have to back-track through a zone for a waypoint to get anywhere. I am not sure how to fix this, but just going through it again to describe and write it all down made me want to uninstall. There is a version of 'Ziggurat Encampment' with a Waypoint, but you have to be at a Cruel waypoint to reach it. This really should be resolved before Full-release.