I would take the lane behind the last car and wait my turn. I pretty much avoid filtering up on the right of lines of traffic. Too many bad things can happen. Dooring and right hooks, people pulling onto the shoulder to jump their turn and make a right. Sometimes such as in this instance it might be safer than many other examples. However it's a bad habit and you just might find yourself filtering in a situation that's not so safe out of habit and have a problem.
Also intersections are a mine field and I find that controlling the lane into and through most intersections is safest I find that if I behave like any other vehicle on the road my presence is tolerated and accepted better. Also other drivers are accustomed to dealing with vehicular behaviour and that acting like one (which I am anyway) makes drivers somewhat comfortable. They are surer of what I am going to do and how they should respond.
Since you are commuting regularly and finding yourself in situations where you are unsure of what to do you may want to consider taking a bicycle safety class. The League of American Bicyclists run excellent classes. Linky below. Ride safe!
http://www.bikeleague.org/programs/e...on/courses.php