I'm going to say that by the sheer tone of your post, that you made your mind up already. You feel bad about your decision, and don't want to come to terms w/ it. But you have definitely already made a decision.
You wrote a long ass post about how he's irks you and then like 2 sentences about why he's a good bf. What does that tell you? I can come up w/ a million reasons why my hubby gets on my last nerve. But, I can come up with 8 million why I love that man. Please know that YOU CANNOT FIX ANYONE. They can only fix themselves, and they will only do it when they are ready.
If you really don't want to let it go yet, then you need to sit down and talk to him. If it helps you, make a list first of all the topics you want to cover and make sure you talk about each and every one. And if things don't change permanently after that. Then you do what you gotta do. O and I say permanently b/c things will probably get better at first, but once you guys settle in again, old behaviors tend to resurface if people haven't really changed.
And lastly, you are the only person who is in control of your happiness. If this guy is bringing and holding you down, then fix that. Quick.