Reverted to /spawnpoint override and made /spawn use the vanilla dimension spawn manager.