Has anyone found the 5 new ship upgrades from the Scalawags DLC?

I've already completed the game and on my first run through I only found upgrades from the shipwright in Queen's Berth.

Are there any other shipwrights or places to buy ship upgrades? So far wikis and such don't have info on others.

You can buy upgrades in pretty much every port, AFAIR. There are also certain quests that give you upgrades as a reward.