My plan right now is to do what torpedoes do in real life. That is, if you set it to attack submerged targets, it will ignore surface contacts entirely (since the homing seeker gives depth). This will be done for all torpedoes.
The reattack capability will be disabled for decoys, since the torpedoes can tell the difference once they have burned through them.