Are you saying that on each floor you have an L3 Switch? If that's true, why such a complex design?
If my understanding is wrong, do you have a topology to exemplify your network?
I am not a Cisco Meraki employee. My suggestions are based on documentation of Meraki best practices and day-to-day experience.
Please, if this post was useful, leave your kudos and mark it as solved.