Better to ride primary through the pinch-point and on the approach to the junction. However, this is no guarantee someone won't try and over-take. This happened to me recently; a guy didn't like me riding primary on the approach and then tried to over-take in the oncoming lane directly on the approach, forcing me to slam on. Then tried to start a fight and block the road every time I tried to move forwards. This is the abuse many cyclists have to endure for nothing more than trying to abide by the rules of the road.
James, suggest you read your Highway code, cyclists are allow to weave and also this driver overtook when the cyclist had signaled, Rule 167. Thats 3 penalty points!
Shouted racist abuse at me