Honey glazed salmon with saffron infused leaks & potatoes

I've run out of ideas when it comes to preparing fish for Shabbat. My husband isn't a fan of fake shrimp, he hates fish with bones so what we're left with that he does like is Salmon or Sole. How many different ways can you prepare Moroccan style Shabbat fish?
Anyway, this week, I said no more! I'm trying out a new recipe tonight, I'm not sure how it'll come out, but I can only hope that we'll enjoy it.

Here's what you'll need: 

6 pieces Salmon fillets
2 large leeks, washed and chopped
1 large onion, sliced
1/2 cup cherry tomatoes
6 to 8 small potatoes, peeled and sliced
2 cups saffron infused water
1/4 tsp thyme or oregano (2 very different flavors, oregano give a Greek flare the thyme something completely different)
juice of 1/2 lemon
1 tsp Dijon mustard
1 tbsp kosher honey
2 tbsps olive oil
salt and pepper

Preheat the oven to 400F on Roast, then marinate the salmon in the honey, a touch of Dijon and a splash of olive oil, salt and pepper and when the oven is hot, place them on a baking sheet and in the oven for about 20 minutes, then at 325F for another 5 to 8 minutes, till golden, then set aside.
In a large skillet, add the olive oil, then toss in the onions and sweat them for 5 minutes on medium heat, then add in the leaks and sweat them for 5 to 7 minutes, after that toss in the tomatoes and saute them till they burst and finally add in the potatoes. Stir everything together, making sure nothing sticks to the bottom, then add 1 cup of the saffron water, lemon juice, Dijon, spices, salt and pepper. Bring everything to a boil, cover, then reduce the heat, the sauce should reduce by half, taste to make sure it's well seasoned, then add in some more saffron water, about 1/2 cup, keep the rest for later.
Lower the heat to a minimum, uncover and let everything cook down for about 20 minutes. You still want a little sauce at the bottom of your pan.
Now in a small saucepan, add the remaining saffron water, 1/2 tsp of honey, some salt and pepper and bring to a boil, then let it reduce by half, you'll be able to use it as a sort of glaze.
To assemble, lay a couple of large spoons of the leak and potato mixture, lay a piece of salmon on top and drizzle the glaze over top.
Enjoy!