laelle, I think you did an amazing job! That is a very complex situation with 'potential for disaster' written all over it and you managed just fine. You came to an agreement with your bf where you both feel good about the outcome. You figured out what your values were, stuck up for what you need, set a boundary re contributing to rent, and stuck to it! Most important of all -
you feel good about it. You go girl!

As for the gym membership - who knows what he might have meant? Not your problem. If you want a membership, get one. If you want to try out day passes for the week that you're actually there, maybe that's a solution too. It's great that you're taking care of yourself, don't start second guessing or imagining impediments that aren't really there. If you ever need validation - I'm here! hehe