Seems like you have met storage laws well enough.
The main range I am a member of is a military club so there's no desk-sitting, just shooting. I involve myself with working-bees and set up of competitions from time to time, but it's not a forced thing.
A 40 minute drive isn't too bad to avoid all that desk-sitting and shit. I'd be doing that I think! Lol.