I believe the lower were Rubicon Express Super Ride adjustables. Factory uppers in the front, RE adjustable uppers in the rear. It was a long time ago though, so not 100% sure I'm remembering right.
I wouldn't get too hung up on lockers, especially if you still have the 35 in the back...