Don't re-pot until spring - if you do it now, you may lose the fruit.
Citrus branches are fairly thin, they do get stronger with age.
If you're worried, support your fruit-laden branches with something like a sturdy bamboo; the problem should decrease as the tree gets older.