What would the point of /mount be without it being able to used during Combat? Sure, you could run faster, but if you wanna go faster just use /fly. So, I believe the only changes that should be applied to /mount is that it should have a cooldown. That's it.