Glad to see you got it figured out.
The voltage regulator looks fine.
I liked the other MOSFET better than this new one. The problem with this new one is it has a poorer worse-case Vgs(th). It is 5V and the other one is 2.5V or 3V if I remember correctly. Since you will be driving it at only 5V it may not be as efficient. When using a MOSFET as a switch you typically want to drive the gate at least a couple of volts over the worse-case Vgs(th).