This is an alternative take on making the short and long-range pathfinder consistent.
In this differential, I simply make the pathfinder grid the reference for static obstruction. Movement is never checked against static shapes, only against unit shapes. The vertex pathfinder should be more permissive than the long-range pathfinder, thus we won't get stuck.
The positive of this diff is that trees, for example, have a much smaller long-range footprint, which will improve pathfinding in forests and such drastically.