Just wanted you to know I made the html changes you suggested to Mobicreator and now it's working fine. I'm so glad I found your thread.
I spent over a week searching the Mobi site and trying to work with Kindle Publishing to resolve the TOC build problem, but I couldn't find the answer until I found you here...