Today's task was to add combo attacks and do minor fixes all around the combat system. Now I will probably be switching focus to enemy combat. I think If I were to continue adding to the combat system, I would find a lot to be useless after adding the enemy combat system. After getting the enemy combat system up and running I will probably see the bigger picture clearer.
On the code side I'm just checking for the attack input when 60% of the attack's cooldown has passed. If input is given a "Combo" boolean parameter on the animator is set to true which I use to disable the "Any State" transitions.