Only thing I'd do different is that, if I needed to take the lane after the light, I'd have stopped in the center of the lane instead of far right. People are a little less likely to get behind you if you show from the beginning that you are taking the lane.
I have a place on my daily commute where the road widens to 2 lanes in each direction right before a light. I stop in the left tire track to let those behind me know I'm taking the lane. It doesn't stop all the idiots from changing lanes to get behind a bike that will be going slower than they'd like but it stops most (except this one guy in a Ford Ranger that will get behind me every time. He honks and yells till he finally changes back into the lane he started in and passes me).