iirc, the gen 2 (mid 90's model, the one with the fender flares) had plastic covers for the headlamps, and is not HID-compatible yet due to the reflector design. the gen 2.5 (almost same body type except that it now has blistered fenders and not the flares) have glass-cover headlamps and is HID-compatible. size-wise, they're the same.
the park lights are also differently-shaped and will not fit vice-versa.
and isn't the diesel montero rare in the US? if you have connections, you might wanna try asian markets, there are a lot of diesel pajeros there with the hoodscoop. and yes, i do find the diesel hoodscoop cooler-looking.