Fixed the second issue – for the Twenty Twelve theme (and its child themes) the class for the nav needs to be changed to .main-navigation.
Thanks for making it so easy!
Now all that remains is the scrolling issue. Actually I think it’s a “feature” but I want to turn it off.