I noticed this too when I switched my takedown to the baton. For all other melee weapons, if I tap F to do a melee strike (whether to break a window, destroy a fence, or hit an enemy), after the melee animation completes I switch back to the weapon I was originally using. With the baton, though, it doesn't switch back. After the melee animation completes I'm left holding the baton, and I have to manually switch back to my original weapon. This is very frustrating especially when I don't notice and then try to shoot, only to swing the baton instead.
