I prefer getting rid of 2fers completely, as well. Possibly either up damaging/crewing them (Tethys), up gunning them (Sho'Kos/Sho'Kov) or a combination of both (Haven).
Something like +4 damage/crew to the Tethys, +2/+4 on the Haven along with 4 AD of AP/DD Light Matter Cannon at range 8, and...