This is a poll of registered voters. When you adjust for likely voters and the Bradley effect, McCain is up by 10 points.
I like your math better than mine. I think McCain will win the popular vote by 5% and the electoral vote with 281 pts.