I'm happy you got it figure out.

I use 6/22 firmware as well. MOBI's TOC needs to be forced most of the time in Calibre then add the appropriate Regular expression to catch all Chapter titles to make a TOC.
I too now prefer EPUB using CR3. I use a inline TOC made with BookDesigner 5 for now till it supports EPUB's regular TOC.