This is why I want to take the "best" parts and assemble them into the films. In this case(the girls you speak of), I would just drop that sub-plot entirely as it's not really relevant, is way too rushed and doesn't help move the story forward. In fact, there are numerous "sub-plots" that are just "filler" and make the show seem like a damn soap opera.
Ha, ha, about the "boring edition." there already is a version like that, it's called the tv show, LOL/ just kidding.
If you are interested in more details about this project, check out the thread on fanres.com about this project as there is a little bit more active conversation there;o)