It sounds like you're doing great. I am sure someone has mentioned an in-person support network can really help.
Friday nights were my biggest hurdle on weekends. I would drink a lot and often become belligerent in a black out! So, early in my sobriety, I would go to a film every Friday night instead. It took some time, but the trigger is much easier to deal with now. As time has passed, I've built up a number of skills and activities to keep me calm and living in the solution.
If you feel it getting very difficult, focus on not drinking for an hour at a time. Listen to some music. Read SR on the 'net. Whatever it takes. It gets easier.
You're off to a great start. Imagine how great you'll feel waking up Monday morning feeling like an X-Man!