Looking for some quick advice on suspension overhaul

Ok, just wanted some quick opinions on my approach to rebuilding my suspension.

The truck: '96 Tacoma 4x4 SR5 Access Cab V6, 195k, original shocks, coils and leafs, rides like chit on anything other than smooth roads. Sits 35 1/8" from ground to fender in front, 36 1/8" in the rear, so I still have my ~1" factory rake. Sway bar bushings look like they were microwaved then put back on.

The plan: OME 881's with Nitrocharged shocks for the front, along with new rack bushings and sway bar bushings. For the rear, Wheeler's 3 leaf AAL and rear OME shocks (can't layout the $459 nut right now for the 5 leaf pack, plus I heard it squeaks like a son of a bitch). Full alignment.

Should give me a nice level ride, mild lift and much better handling, right? Should I be overly concerned with CV angles or vibration?

OR, I could do 5100's all around, front set at 1", just to level it out and I should still get a much better ride, right?

 

That is a very good setup. Should like the ride much better than stock. CV angles will be fine. Only other thing to really consider, is if you take is off-road a lot, then maybe an extended rear brake line, since the new shocks will allow for more down travel.