Glad things went a little better the last couple of days, but remember you still need to be assertive when stating your needs. To me it sounds like you are being shuffled from primary to secondary position, (for lack of a better way to put it); if you're cool with that great, but if your not, you need to let that be known immediately. I'm all for giving of yourself to make your love happy, but if you give too much of yourself, what is left for you? Good luck to you. I hope everything works out the way you would like.
There can be no failure to a man who has not lost his courage, his character, his self respect or his self-confidence. He is still a King - Orison Swett Marden