Waypoints are unfortunately the least of your problems. The levels of the core game have been completely scripted as "once you leave, you never come back": their scripts assume they get initialised only once, and many shut down after you leave the level.
You can, however, add extra terrains to the existing levels and put your add-on content there.
