ugh..
again~ Shoha 1 and Shoha 2 are seperate because one is for single target and the other for AoE, same with Senei and Guren, aswell as the upcoming Single Target Ogi in 7.0, merging those type of attacks only turns the Samurai into a Dragoon with a Katana, since the Dragoon doesn't give a crap for such situations which the Samurai does! Yeah Dragoon also has AoE and Single Target Combos but Geirskogul and Nastrond only show the real nature of the Dragoon not taking these Situations as serious as the Samurai do.
A better suggestion to 'address' button bloat would be to roll up Tsubamegaeshi into Iaijutsu, since Tsubamegaeshi doesn't contribute to meditaion anymore it's just a "Do your previous Iaijutsu..
AGAIN 
" .. that could be put on one button.
and of course Kaiten has to return, or else Samurai may remain requiring no brain to play, which is sad.