Replace on lift on 2006 4dr 4x4

I originally lifted my truck in 2008 with a Revtec spacer and AALs. I also added front diff drop and total chaos UCAs. I run Nitto Terra Grapplers 285/60 18 with only minor trimming.

5 years later the stock shocks need to be replaced as well as the tires and ball joint on the UCAs.

I'm leaning towards changing the lift to one with a better ride (while maintaining the same height) and Im looking for suggestions. Also, does anyone suggest rebuilding the UCAs? I found that the parts are half the price of new ones.

 

My concern is the height difference. I was looking at changing to OME 885s with 5100s but Im unsure if that lift will be lower than my current height with the revtec spacers.