If you want to really use that "baton", which is really just a longer variant of the Okinawan tonfa, then take a good Okinawan style that teaches kobudo/kobujutsu techs that include the tonfa. You can ask the instructer to teach you tonfa techs specifically. Just tell him/her that you are 5-0 and they'll make an exception. Usually weapons training begins at green or brown belt.

You have lots of standing and ground controls, locks and grappling in Okinawan karate. It's called tuite. These are useful for restraint. BJJ is probably not such a good idea at first. If you've never trained it teaches you to instinctively go to the ground, especially the guard. Wrestling is done by a lot of police types and Americans in general in HS. Football teaches you good enough tackling and hand grappling techs. 99% of bad guys know nothing when it comes to submission stuff. Most cops did these sports.

Chin Na would be a better choice than Judo, JJ or wrestling. The Filipino stick/weapons arts are alright, but even in the PI the cops and the military don't train in them. As a matter of fact most filipinos don't think of them as effective fighting arts. They tend to train in Boxing (Kick and Western), JKD, Karate, Kuntaw, and BJJ.

In the end Gun-Fu is superior to all fighting styles! Just my 2 centavos....