Okay, I just watched 'Hush'. 'Beer Bad' is forgiven. Now if I could just synch up my Angel watching with my Buffy (I'm watching Angel on Hulu, so I just saw Faith arrive in LA before she left Sunnydale - doh!)
You really just need to alternate back and forth. Watch an episode of Buffy, then watch an episode of Angel. They sync up pretty nicely that way (but it sounds like you need to get caught up on Buffy a little bit first to get to that point!).