Recommendation letters post master's
I don't see much value in a letter from an old relationship that is no longer relevant. Your recent work will almost certainly be considered more heavily than anything you did as an undergraduate. (Extraordinary cases aside.)
Get letters from those who know your work and can make a (positive) prediction about your likelihood of success in the new program. That probably means professors and/or advisors from your MS program.