Totally with you on the tone deafness -- both for the character moments at the end, and for the final battle of Atlantis vs. the Hive. Atlantis, full-powered at last, should have reared into view like fucking sunrise and creamed her opponent -- but the writers had to get in one final, "Shields down to bippity percent! We can't take another hit! Our suspense iz pastede on yaye!" *sigh*

Am I the only one who loved seeing Davis

No way. My favourite moment in the whole damn episode was something that probably everybody else barely even noticed: Davis' reaction to Walter's "radio chatter, reports of fireball" line, which I totally interpreted as, "OMG, I can feel the paperwork headache already."