Bris, you are correct. That is the way I was taught but this is what I ran into:
First, I will paraphrase from HEC22;
at a structure, ie manhole, add the losses to the downstream energy grade then subtract the outlet pipe vepocity head to get HGL. Next step is to add pipe losses to HGL then...