Moving forward, automatically label new mail with a filter and skip the inbox. If a message shows up in the inbox, edit your filter to correctly sort it or make a new filter+label combo.
This way is smarter because you work from a general to the specific, and iteratively, instead of in one sitting.