Cherokee33

Hey guys I put a 2" budget boost on about a year and a half ago that has 2" spacers for the front and 2" blocks in the back. I had a driveline vibration and I got that fixed. I want to get rid of the rake that it has. I'm considering new 2.25" spacers or new oem coil springs for the front. Does either of these sound right or would you do something else? A pic should be attatched. Thanks in advance