LM2596: If LMR33630 is the perfect one to replace LM2596S-5.0?

Dears

The Part Number is LM2596S-5.0. But I found it's status is NRND, which means not recomend in new design.

So I ask to be recommend the replace one. If LMR33630 is the perfect one to replace LM2596S-5.0. Which package and which full Part number?

Thanks a lot.

Elsa Duan