I admit myself to not know an inkling of Japanese! I was rather befuddled by this Picture Drama, as it confused me regarding the chronology of Genbu's murder. If some Japanese speaker can come clarify this for us, it'd be much appreciated!

And I agree that if your subs are more accurate, it does take away the premeditative element, and I would agree wholly with your assessment of the situation.