Diode and MOSFET SMT replacement
There can be several good choices. As of now I think the selection you have done fair enough and should work.  


The new chosen diode had maximum Reverse voltage of 50 V Rating and it should be okay for a DC motor. If you have a chance, you can choose a diode with higher reverse Vorlage Rating.  
The \$V_{GS}\$ of chosen new MOSFET is even better than the previous one. It looks good as well, including the breakdown voltages. The current ratings I believe should be fine too.