You are correct, I hope that I haven't made too many errors involving the semantics. I appologize, though the main points are still valid.
Now I see the issue. Phi is indeed the drop across the semiconductor junction, but since Vbi is going to be present regardless of the Va, Vbi doesn't...