I like the former (go back to spawn). The second ability sounds like it could have a race based around it.