Raijin should just automatically turn into Fleeting Raiju or Forked Raiju depending on the distance you are from your targeted enemy. That way neither one would require taking up two tabs in a hot bar and people who like either one can keep both.