Pat the cod fillets dry with paper towels, check for pin bones, and cut into 1 1/2 inch chunks. Cover and refrigerate until needed.
Dice the onion, slice the celery and carrots, mince the garlic, and peel and cube the potatoes into 3/4 inch pieces. Keep potatoes in cold water until ready to use.
Chop the parsley, juice the lemon to get 1 tablespoon of juice, and cut the rest of the lemon into wedges for serving.
Set a Dutch oven over medium heat and add the olive oil and butter. Once the butter melts, add the onion, celery, and carrots with 1/2 teaspoon salt and 1/4 teaspoon pepper.
Cook for 7 to 8 minutes, stirring often, until the onion is translucent and the carrots begin to soften. Do not let the vegetables brown.
Add the minced garlic and stir for 30 to 60 seconds, just until fragrant. Pour in the white wine and scrape up any bits stuck to the bottom.
Simmer for about 2 minutes, until the wine has reduced by about half and the sharp alcohol smell has faded. If skipping the wine, move on and add the extra broth in the next step.
Pour in the fish stock or vegetable broth and water (plus an extra 1/2 cup broth if you skipped the wine). Drain the potatoes and add them to the pot with the bay leaves and dried thyme.
Turn the heat to high and bring the soup to a boil, then reduce to medium-low so it bubbles gently. Partly cover and simmer for 12 to 15 minutes.
Test a potato cube with a fork; it should slide in easily without falling apart. For a slightly thicker broth, press a few potato cubes against the side of the pot with your spoon.
Sprinkle the cod chunks with 1/4 teaspoon kosher salt and the remaining 1/4 teaspoon black pepper. Turn the heat down to low so the soup is barely simmering.
Gently slide the cod into the pot so the pieces are mostly covered by broth, adding a splash of water if needed. Cover and cook for 5 to 7 minutes, until the cod turns opaque white and flakes easily.
Check one thick piece with an instant-read thermometer; it should read 145°F. Stir only once or twice, gently, so the cod stays in big, tender chunks.
Fish out the two bay leaves and discard them. Stir in the 1 tablespoon of lemon juice and the chopped parsley.
Taste the broth and add up to the remaining 1/2 teaspoon of kosher salt if needed, a little at a time, since your stock may already be salty.
Warm your soup bowls under hot tap water, then dry them. Ladle the soup into the bowls, making sure each one gets plenty of cod, potatoes, and vegetables.
Serve right away with lemon wedges on the side so everyone can add a squeeze.