Ok I am going to throw an opinion out there, but bear with me it will BOOST your SEO tremendously.
This is VERY important - h2s are supposed to be used for logical reasons, not design reasons. They are sub-headings for your main heading. They are main places to place KEYWORDS for your SEO. Google rewards people who use logical character formatters like heading tags as such so using your h2s in this way actually right now (in the way you have been using them, or in the way you plan to) is NOT going to help your SEO at all. Actually it is HURTING it.
I have pages of empirical proof of this. So, just my opinion, I would not do it this way :-)
If you want more info just msg me - I won't hijack your thread :-)