If it was a hydrometer calibration issue, both would be off.
Do you fly sparge, or batch sparge? And do you stir the runnings prior to taking a preboil reading? I've found, especially with fly sparging, that if you don't stir your preboil wort prior to reading you'll get it wrong, since you're grabbing a stratified wort. It'll diffuse to consistency over time (or be stirred as such in the boil), but I've learned as a result to take preboil with a grain of salt. I'm usually within 0.2°P (approx 0.001 SG) actual post-boil gravity from what I calculate from pre-boil, but it's the same issue as topping off with water post boil, it's hard to trust that everything is evenly mixed.