Definatley weight training and street. I have been involved with and connected to emergency services for most of my life. Most fights that police officers get into are of the on the ground, grappeling type. "Traditional" martial arts skills really won't help you in one of those situations. However, be sure to add cardio and pushups, situps etc. to your routine, police academies love to do that stuff.