mk2 mike

Hi i havent used this forum much but hoping to get some helpful advise.

My car is a mk2 escort RS2000 nut bolt rebuild. Engine is a pinto fast rd cam, big valve head bikecarbs std bottom end, single prop, english axle with lsd about 160 bhp.
Just got it on the road and the diff is noisy. SO. A few choices and one decision.
Do i just get the diff rebuilt, and keep using the 22spline origonal shafts. bearing in mind i'd need a new crown/pinion Cheapest option.

Or i could get the 16spline and meaty 3j diff set up with new crown pinion next. trouble is the pinion is still the weakest point.

Or for a few more hundred quid i could future proof for maybe a bigger engine in the future and go the shortened Atlas route.

For now the car is for street use and fun i.e the odd burnout or sideways action on private roads of course, but i'd like not to be snapping standard halfshafts and being stuck waiting for the rac! I have no idea how easy they are to snap. Im using 175/50/13's so not tonns of grip but not sure what route to go axle wise.