I'd try the 2.5s but stay away from the 2.0 series; lots of breakages in the Landcruiser world with them. I'd definitely go Bilstein/OME. I'm a firm believer in the KISS principle when it comes to suspension, most of that Baja setup stuff might ride great a while, but how often are you willing to deal with it needing rebuilt etc. Most guys aren't using it how it's intended anyhow so it's all fluff. My $.02