New Swain's ult delay is clunky, add buffering of other spells please

So many times in just one game I've died only to notice I had spells off cooldown and could have won the trade simply because half of my button presses went down the toilet with the R casting time.