Look in the Kesef Mishna, the Beis Yosef does not argue — he has a mesora on the pshat in the Rambam.
About the final psak, ask a Posek — he’ll confirm what I’m saying. “Igros Moshe” has a teshuva(teshuvos) about it. I think he writes like I wrote to you. Double check there.