The solid axle swap would be the first thing I'd do to your car bro.Alot of people have done it for the exact reasons you said.Do it,you won't regret it.Oh,I see you every morning,very nice car man.