If the spoke diameter is substantially different to the spoke hole diameter, you should be re evaluating your choice of spoke. Granted the spoke head will shift marginally into the direction of tension, but my comment about hub pcd was merely to point out the poor logic in seeing the true measurement of a spoke as being from the inside of the elbow, therefore requiring a changing measurement of hub pcd depending on the lacing pattern which we obviously do not do.

For all intents and purposes the op can measure the spoke from the inside of the elbow and add, or not add, half the spoke diameter as he wishes, the measurement will be close enough.

- joel