Don't overlook sources of anti-productivity which might be easier to measure like the time it takes to build & test code changes.