Mmm, jcais, your second consideration is true, but there are other factors that greatly affect the bond lengths.
In addition to other atoms, protons also attracts something MORE DIRECTLY...
HOWEVER, that something ITSELF have YET more decisive influence on your problem...