Don't know whether this might help, but you could perhaps consider using your own styles for tableCaption and figureCaption instead of the 'caption' mechanism. Set the both of them to 'keep with next', I imagine.

Minor disclaimer: I've never, ever used the 'caption' mechanism, and my own documents have the table caption as the first row of the table.