I agree the xpen would be wise. A restricted area should definitely help to make it clearer to her where she needs to do her business.
Right now, unfortunately, if she is peeing all over your room it makes it that much more likely she will go back to those same spots to pee again and again. Maddening, I know, but dogs really do "follow their noses".
Good luck. It sounds like you are headed in the right direction and I hope you see some improvement soon!
