It's difficult to completely remove ourselves from the drama.
You're getting sucked in less, though, which is a great start.
Yes, you asked about the bottles, but you didn't confront, there was no argument, and you stood your ground about not cleaning up other people's bottles.
Baby steps.
Sounds like you're doing good.