Why not just add shims where needed and be done with the problem?
My thoughts too.

Cheers
Roger