Playing around at the moment with making some lists from the new fleet, and I'm finding that the Merchant class is now 100% worthless.
The Emissary, for 5pts more, gains 5cm speed, 90* turns, 2 WB and a fighter bay. The other two emissary variants are similarly better equipped.
The merchant is upgradeable to have an extra 2 HP, where the emissary can have front armour, which distinguishes them a little, but otherwise they are a little too similar.
Similarly the Defender vs Castellan, and Hero vs Protector are similar choices, but slightly more differentiated to make the choice a little more interesting. It would be a bit better, in this new joint fleet list, the ships were a little more differentiated into separate roles, rather than having essentially a 8hp 45* and a 6hp 90* version of the same ship.