Actually, how much does the ohai shadowing issue come up?  I'm almost feeling like the change is too disruptive compared to the bug its fixing.  And what about just adding warnings that you just set a node attribute uselessly that shadows an ohai attribute?