Jay - I'm all for collecting spares for "next time", but I'd go with the shaft swap only!
As I said above I slid into a kerb in my Wj whilst towing a Land Rover on a trailer - so it was a decent smack!!

The shaft swap is relatively easy and a damn sight quicker - as for the Uniibody/ suspension arm damage - I checked mine and no issues

I reckon the suspension soaked up the sway - that's what the bushes are for!
Keep in mind that if you go for the axle swap - check the ratio's!
Good luck and the sooner your on the road the better
Dougie