Yes and yes, and I'd encourage people who don't like Ehrman to check out the more conservative scholar James D.G. Dunn and his book "Did the First Christians Worship Jesus?: The New Testament Evidence". It's very readable, and a pretty short read at that - but he's pretty thorough and you might be surprised at his conclusion. It's much more nuanced than a straight "yes" or "no" answer.