I've decided to move to doing one file per navy at this point, both to ensure lists of reasonable length and to cut down on the amount of work required. Here are lists for Brazil and Spain.
However, when I went to do Turkey, I found the data more or less pre-sorted, so I did two, one containing combatants (I know it says surface combatants, but due to the amount of overlap, submarines were also included) and the other one other vessels.
Also, I'm still taking requests if anyone wants a specific navy done.