I don't believe that they 'always intended' that (or almost anything else) Zorro was the dragon daddy. I'm positive this was just a random throwaway line to satisfy/make fun of a long time fan complaint.
I'm still interested in seeing the fanfiction people get together and completely rewrite the show. The 'real' show is over now so maybe they'll step up and fix this thing.