I love this game too.
Also just saying about your quick stab attack is that katanas were really never meant to stab. They are agile and graceful, a mediaval broadsword is more for cuts and stabbing.