I used the A2 Aviator, great light, but I recently upgraded to the U2 Ultra from Surefire, same run time from the high power beam, twice the light in the same package. Also the U2 has a red light adapter available.
Now for a weapon light I use the Surefire X200B on my USP and the Insight X2 Laser light for my P99c.