Got the map finished up and released to the Steam Workshop: https://steamcommunity.com/sharedfiles/filedetails/?id=3229965555
Detailed a bit more and fixed the broken logic