I think replacing Swap with this idea would be better. I never take that spell, but if it meant I could for example replace myself with a bait (like the wooden log jutsu from Naruto) that lasted 2 - 3 turns while I teleported to even 2 cells away, that would be pretty useful for when enemies gang up on you.