Yeah, the final confrontation was similar as well, but this one, for the rest of the episode's flaws, was handled much better than "The Satan Pit." Building up an ultimate evil for two episodes and then revealing it to be a hideously CGI'd Judeo-Christian devil doesn't work.