You're missing quite a lot types. Gunboats, gunships, artillery crafts, assault crafts, patrol boats.
I'd rather have more flexible system build of 2-3 icons. One for size (small boat, large boat, small ship, large ship, huge ship), and one-two for function (main weapon/equipment/capability).