There is a third option of a more gentle re-pot. To keep it in the same size pot and control growth, do a little root pruning and a little canopy pruning. The general rule is cut the bottom off the roots (it can be just an inch or so), calculate what percentage of roots you have removed then cut an equal amount off the canopy.
Good luck with your re-pot.
