Rocky start?

I'm starting to get confused about my budget...the problem is, for our shared expenses, I usually pay up front and then my sweet BF pays me back.  We get paid on opposite Fridays so it works out that he pays me back on weeks where I don't get paid.  I guess the problem I have is that by the time I get money for him for groceries and stuff, that money is already out of my account - do I add it back to my account in the same budget category for the next time I buy groceries or do I just add it to my debt payments? 

Blerg.  I'm so confused right now.  Perhaps I just need to sit down with my budget, my accounts, my spending diary and figure...this...out. 

I've also considered opening a joint account that we each add a set amount of money to and all bills and groceries get paid from that account.  That certainly would ease some of my stress when it comes to paying our bills and buying groceries, and keeping my separate bills completely separate!  I've talked to BF about this and he's happy to do whatever it takes to get this sorted out.  I think we need to discuss it further...however, any suggestions would be welcomed and appreciated!