Is the Queen Elizebeth from Shakespere Code the same Queen Elizebeth that the Doctor Sexed up? (GOOD Queen Bess, VIRGIN Queen?)

I think the writers want us to think so. I watched the clip from End of Time, and noticed the Doctor did not say which planet the marriage took place on. The Doctor also stopped short of saying what the Good Queen Bess's nickname was.
On the other hand, why did Queen Elizabeth call the Doctor her enemy when he had not met her yet. Either way, somewhere & sometime there is a upset Queen. The bad boy side of the Doctor!