An alternative to solve this problem is to always add the page title as a H1 level header at the start of the hierarchy.
Pros: We have a truthful rendering of the header structure for the page content
Cons: This will change the looks of the TOC, might be considered as a bug by users.