Yes that's right. The Estimated payments go towards it all. Your final tax due includes both the regular income tax and the self employment tax (for SS & Medicare). So you don't have to break it out.
