upgrade rattlesnake or new light?

Hi, I was looking for some input for possibly getting a new light. I am currently using a M90 rattlesnake at work (inspecting total losses in a poorly lit warehouse) and looking to upgrade to a LED based light for better runtimes. The form factor is good because my trainees won't lose it cause its so big. I was thinking about getting the new P7 head from PTS, but for that price ($160) I could possibly get a whole new light. I am looking for something pretty bright ~500+ lumens is preferable. So far I was checking out the lumapower MVP 3xcree and P7. Any thoughts??