I am hoping that the Heller decision will be 7-2 in favor an individual right and striking down all of the challenged DC laws as unConstitutional under any level of scrutiny.
That will kick the can down the road as to whether the right is "fundamental" and what level of scrutiny applies. (Obviously, it wouldn't be in the Bill of Rights if it weren't a fundamental right.)
The Hayes case I would predict should be decided as an unConstitutional ex-post-facto law and the nature of the Second Amendment won't be a factor.