Hi John,
It’s a difficult one! The recommendations on the Mobile Marine Models website seem to be geared towards making a towing model. If you are only expecting to do free running then it looks overpowered to me. A 40mm prop is very big for this size of model.
The 555 motors would be too heavy I think, for such a small model.
It also depends on how ‘accurate’ you want the underwater appearance to be – only the fish will see it when afloat!
Personally I think your 385/35mm combination should give pretty good performance.
I am currently building a motor yacht based on Vic Smeed’s Silver Mist (see separate topic). It is only 21 inches long and is fitted with two MFA 360 3-6 volt motors driving 25mm 3 blade props using 2:1 reduction pulley drive. Initial domestic tests have shown it trying to climb out of the bath on a 7.2volt battery! Photo below.

If you want to go down the gold plated option route the Prop Shop will sell you prop and nozzle combinations. However their combos are measured in inches. You can see the details here:
https://www.prop-shop.co.uk/products.php?cat=kort-nozzle-propellers
There are independent suppliers of fixed Kort nozzles but from what I can see they all start at 40mm.
Hope this helps,
Colin