I kept a B hull, since my captain has tier 4 skill for extra range (which results in 15.2km range in hull B) and I was rarely able to do much damage at 17-18km.
AA stayed mostly same, so I decided, that extra gun + torps are more useful to me, than rarely used extra range.