We have tried this but now all of the HTML that our Shortcodes generate is being impacted by wpautop. For example. I might have a shortcode that outputs something like

and I end up with something like this

Any thoughts? I have been looking all over and finding a lot of people posting solutions that solve one problem but just introduce another.