Sounds like you're on the right track. But definitely have a professional take a look at the front driveshaft. Its not impossible to work on them at home but the DC's can be difficult and complicated and if those double cardans break while driving down the road.....it can cost a lot of money in friendly fire casualties.