See these are the exactly the tips that I need for making these kinds of dishes. Ginger paste using it in an earlier stage. Good one!

And the tomatoes making the paste, also not a big step...but sounds like it might make the difference.

But you have never made the naans? It is truly easy honestly!