Chris,
From what you describe, it sounds like the two buildings are substantially similar. Since there aren't full time occupants in the storage and lab building, pursuing EB&OM for both buildings might make sense. You may want to make sure the larger building can meet all the MPRs and Pre-requisites for EB&OM before you proceed.