I still think 16i is a bit much. Somethinig like Hayate's 4P deserves 16. H+K is superior to that in safety, range, and recovery (because it doesn't leave him BT like Hayate). It matches Hayate's 4P in speed and anti-crushability.
4P has room to be sped up, even with its follow ups.
H+K will...