Kaoru Mitoma returned as Japan survived a second-half wobble to set up an Asian Cup quarter-final with Iran or Syria after a 3-1 win over Bahrain on Wednesday.