It's interesting that you find the retcon emotionally true. I wasn't actually bothered by the "which ship was he on" thing, but I was (as I just posted) bothered about this guilt Adama's supposedly been carrying all this time. I can certainly see how that has informed his choices this season, but I can find nothing of this guilt in Olmos' performances in S1-S2, so it feels very emotionally *un*true to me.