Is there a macro command for this...

[Raldo]

I don't really understand why the recast change would screw with your macro (I suppose you probably have multiple macro lines of Kaiten because the macro system sucks), but that aside... Sadly, no. The macro system doesn't really have any ability to do if/then stuff. Also, the macro system is garbage for combat and should be avoided if you can help it.