Yes do the gen 2 upgrade. Be sure to upgrade to gen2 rotors, there is a difference in the thickness and if you use the gen 1 rotors you run the risk of loosing a pad on the road and that could mean big trouble.....don't ask how I know...

99 Gen 2.5, fixing blown head gasket
89 SWB- 33's, ARB Front locker, SR rear locker/axle, SR F brakes, winch, WST Offroad Armor all Around, 2.85 Aussie T-case Gears (SOLD)
Sold: (2) 95 SR's, 86 SWB, 90LWB, 91 LWB
-Can Change a timing belt in my sleep..