Both cool ideas! Storage corresponds well with the Deck 6: Supply, and I can see Research (depending on the type) could fit in the Crew (for medical/biological research), Sensors, or Engineering departments.
I misunderstood then. If there are only those departments, are there only 7 decks, or will there be duplicates?
Edit: rereading the summary seems that it's the case.
