Obviously people with good taste populate this board. I like my 9P, or 9N, and USP45f.
Back on topic. The high output lamp (the P61) can be used with the original, Z2 combat light, C2, D2, M2, and the G2. It depends on the size and total output you want. The E3 is slightly smaller than the others, and will have the 23 lumen longer run lamp, as well as the standard lamp with it's 70 minute run-time. The other models will have the standard p60 lamp with 65 lumens for about 60 minutes, and the p61 120 lumen lamp for about 20 minutes. If you want the smallest then the E2, the lightest would be the G2, the toughest is definately the M2. I think that the C2 is a good mix of features. It only has a pyrex lens, and the bezel doesn't have the shock resitance of the M2, but those are fairly minor points to me.
There is one other thing you could do. It might fit both your needs. You could get or make a battery blank, and use just 2 batteries in your 9Z with the p60 lamp. This would give you 3 hours of light with 6 batteries instead of just 2 hours.