As an update, Shava broke up with me in the middle of March. For related reasons she ended up moving out at the end of March. There was a lot of stress surrounding my desire to keep the landlord/tenant relationship reasonably separate from our romantic relationship. I knew that keeping those separate would be hard, but it was an absolute requirement for me. So, we worked with the requirement until it became impossible. Trying things that might not work out is often worth the risk; I definitely think it was worth it in this instance.
I think that by the end of March, both of us believed that getting distance was a good idea. The challenge now is to figure out to what extent rebuilding friendship makes sense.