Getting new chassis, lift upgrade dilemma

So My 06 TRD Offroad AC failed its frame inspection last week and it'll be replaced in 5 months or so. In the meantime I'm thinking about upgrading my lift while everything is torn apart. I've realized that my current setup wasn't the best idea and it probably rides rougher than it should.

Current setup: 5100's front set at 2.5 with stock TRD Offroad coils. Stock UCA's. ECGS bushing.
Rear: 5100's with a 1.5" block. Running General Grabber AT2 245's, no plan to go bigger.

What I'm thinking is either:
1. Get back in alignment the cheap way and lower the 5100 to 1.75" and remove the blocks, stay with the stock TRD coils.

2. Go with LR UCA's, set the 5100's to 0 and get some OME 885X or whatever works best for Access Cabs, and some sort of AAL in the rear.

What do you guys think?