I'll go ahead and answer here (and there if you have re-posted it).
I think you have to do what you have to do to make the table understood. I applaud you for accurately saying "I want to apply all the rules I can" while still dealing with the material you have. BF can't address every situation and the intent is to ensure we are all doing our best to "apply all the rules we can". Be sure to write a careful transcriber's note to explain how you are changing the print format. I suggest having someone else read it over and see if it makes sense to them.