1. I think you're going to want to keep to 2 dock cards per player.
2. Fish crates are not returned to the general supply as that will change the end game trigger.
Of course you can do whatever you like but I believe this is the intended way to play.