@AnnieK You are reading correctly and your proposed solution is viable.
However, I have been known to make it work by filing a 502 part year return and including as MD income the MD source income earned while a nonresident.
CAGMC.
The more I know the more I don’t know.
