I would love to see, when you embed a grunion contact form, that the visual editor displays a placeholder much the same way as a gallery insert works.

This would be much more acceptable to clients who get confused by seeing extensive shortcodes. The could hover over the grunion placeholder and get an edit icon to bring up the visual contact form fields editor.