You bet, we are in a better place - at the moment. BUT, a lot has changed since the AWB expired and since the Heller decision.
The anti-2nd-Amendment crowd currently has the House, it looks like they are about to have the Presidency one way or the other, and they have a pretty good chance of having the Senate as well in the very near future.
The next AWB, if they can get it enacted, is very unlikely to include a sunset provision like the old one. Remember what the VP-elect said about what she would do in the first 100 days if she became President? Consider the fact that she is soon to be one heartbeat away from holding that office. Also consider who the President Elect just selected for his Cabinet. None other than Beto "Hell yes we're coming for your AR" O'Rourke.
While the last 6-12 years have seen some very good, key, things break in our favor, I think that those days may very well be at an end.
Hopefully I'm wrong, but from my perspective it doesn't look very good right now.