Agreed. If it was going to be Gaeta he would have switched to All Along the Watchtower at the end.
If feels like they're building to a big reveal. One way they could go, and mind I'm not argueing it's the way they
will go or
should go, but one way they
could go would be to unbox Xena, bring her to Gaeta -- she says it's not him; blow up the resurrection ship (the one we were told would end
all resurrections); Tyrol discovers what Tory did and throws her out an airlock -- she dies a final death except... she resurrects in a tub of goo where she is greated by Kat or Sheba or Cain (or whoever the final cylon is) who tells her the final five have their own resurrection capabilities...