That would really suck, because that gag was already used for
, which also dealt with
. I think it's possible someone is yanking your chain. At least I hope so.
According to Ron Moore in the latest podcast commentary, Daniel has nothing to do with Starbuck, nor will Daniel be a part of the finale. He saw a lot of speculation among fans on the internet and wanted to put it to rest. Daniel may have something to do with the upcoming Caprica series (as Moore hinted in a previous podcast) but as far as BSG is concerned, Daniel only exists as a fix to explain why the writers named Boomer/Athena "Type 8," and leaving an empty slot for "Type 7."
And that great whooshing sound you're hearing is the wind being taken out of a million fanboys' sails.
He also mentions that at the center of the Cylon's Bodolza-class ship is the original Earth ship the Final Five arrived in. He's pretty disciplined with spoilers, so the fact that he's discussing it in the podcast seems to indicate that we won't be seeing it in the finale.