While it's nice to float wish lists of stuff we want, there are two salient things to remember. The first is that they WILL NOT give us anything we want if they can avoid it. The second is that any concessions they might make will be repealed, or at least legislated into utter uselessness down the road.
If it looks like they've got something with a chance at passage, things like nationwide reciprocity or alterations to the NFA will be appended as poison pills to kill it, with little expectation of success or benefit.
Precisely. There will always be provisions in any "offering" to our side that will enable them to easily repeal/defang it at some point in the future.