I actually run into this same problem with my team. However, I've never had a situtation where I've lost a battle where Hinata's skill activates on the 2nd turn. In many cases, I've actually preferred Hinata's skill activating on the 2nd turn, because the opponent uses Hinata on turn 1 and locks down my entire team.