Thanks for that .. I'll go through the document in the next few days when I have a couple of hours spare and come back to you with my thoughts.
Hopefully your boss doesn't get upset at having this document in the public domain ... ?
However, looking at your revised, posted expressions, there are still some problem areas to sort out as, for both expressions, the two sides of the "equation" remain dimensionally incompatible and, as a result, cannot be equations.
However, I can probably work out where things have gone astray by reviewing the company manual and, perhaps, the AFM if needs be ....