The tension in 2nd Sierra Bonita scene is better than the Lost on Mulholland arguments for the former lovers theory, which are that she's obviously butch, and she checks out Camilla.
So they switched apartments for a reason other than to help Diane evade the police. As an aside, I think DeRosa might be in the dark about the hit and is giving the cops the blow-off in good faith. (We don't even know she's even blowing them off. For all we know, she sent the cops over to 17, too.)
The DeRosa/Diane backstory they offer on LOM there is that DeRosa was a Camilla substitute that came in handy when things started heating up with Adam and Camilla, which would explain the presence of the piano ashtray in the "Go Get Some" scene.
Diane could also have started moving her things into 12 before the switch, or even borrowed the ashtray after the switch if DeRosa didn't leave it there while visiting --- I prefer the simplest explanations.
LOM also suggests, as you mentioned JFK, that Go Get Some and the breakup might be a fantasy; Diane was never with Camilla, she just wanted her and her success, and DeRosa could have been the lover in reality.
I could see Diane being utterly delusional about her affair with her movie star friend, which would be a reason for having the object of her obsession killed. In this scenario, masturbating with deeply ingrained false memories of a breakup in her mind would show how imbalanced she is. She had, after all, just woken up from a the erotic Betty/Rita dream in which she had total control over her.
And the apartment switch happened for unclear reasons... (and there are two stories, so there may well be two reasons!)
I havent worked it out, either!