Back when I lived in Detroit, I had really good luck with the folks at the Plymouth Rd. Belle Tire (Plymouth and Levan area, Livonia) for accurately diagnosing and inspecting driveline stuff.
The lift you are looking at should be fairly straight-forward to do yourself in an afternoon, though you may end up with some rear driveline issues if you go >2" without a proper resolution in the form of a SYE and new rear shaft. I know, I tried the t'case spacer with my YJ and a 3" lift. It was never quite right, and I ate u-joints faster than I'd prefer to have done.
If you were up here in Lansing, I'd point you to a shop that specializes in Jeeps and would do you right - diagnosis, lift install, tweaking/details afterward - but that's probably more of a drive than is worth it for a Dearborn resident.