Zorro,who was your childhood friend Diego de la vega..was secretly in love with you yet he wouldn't show it.

As he's afraid that if you figure out he's zorro you would be afraid to be with him since he became the commander's target to get rid of.

However you did have your guess that Diego is actually zorro.