Figured it out just after posting this question.
The trick was going in behind P4's back and stripping out the keyword expansion.
chmod +w foo/bar/blah.hedit foo/bar/blah.h #change $File: //depot/foo/bar/blah.h$ to $File$chmod -w foo/bar/blah.hgit-p4 submit
This worked.