Panels titles being selected for as node title

So, this isn't a bug, but I was hoping somebody could point me in the right direction for theming. My problem is that I have a panel node layout where the panel title (H1 page-header) is not the node title. The node title is included separately, below (H2 pane-title). Edit believes that the edit should go on H1 page-header, and not h2 pane-title. Weirdly, though, if I include a comments form, Add Comments gets h2 pane-title but Edit wants to edit *that* one, not the H1, as if it's the node title. Pretty much any heading *except* the actual node title...

Saving works - it saves to the node title properly. It's just the edit interface shows up on the wrong div. Adding "field-item" to the pane class doesn't work.

Anyone have advice?