No matter what you decide, make sure that you do it on the right time. If you are in the northern hemisphere this is not it. Waiting for the right time, you have a lot of time to look at the tree and decide what you want to do with it.
I agree on your thoughts. Bigger container and new leader sounds like a good plan. I would suggest shange the planting angle when doing that and grow the new leader in the opposite direction.