Which upgrade is the best value for getting back to stock alignment?

So I bought a 2012 Tacoma a little over a year ago from a dealership because I fell in love with it at first sight, as the previous owner had done almost everything I had wanted to do it: front and rear lift, removed all the badges, aftermarket lights, larger wheels, etc... And I love it, but I definitely jumped without knowing too much and while the car has given me almost no problems so far, I am at a bit of an impasse and unsure what to do.

The car has a 3" lift in the front with Bilstein 4600's, stock UCA's, and a 1" rear block and about 5-6 months ago I noticed the wheel camber that comes with sticking with stock UCA's. Now I don't have any abnormal tire wear but I have seen some rub on the coils and the camber is bothering me, so it is something that I want to take care of. So my question is: what is the best bang for my buck for getting back to stock alignment, new UCA's or take it to a 2" lift and get smaller tires since I have 285/65/r18's and I read that you pretty much need 3" to have those comfortably?


Sidenote1: I just noticed that the spare on the bottom is a 275/65, will a 285/65 fit down there? I really would like to keep the spare there instead of in the back if possible.

edit-
Sidenote2: Also how can I tell if I'm still on stock coils?