Too many document libraries?

I am building a documentation system using SharePoint 2013 Enterprise, for all of our clients, I work for an IT Support company

I have created a site for client documentation that has the following menu options

• Client overview is a list


• Client Forms is a Infopath forms library


• Client passwords is a list


• Client video is a media library


• Client documents are document libraries

The client overview shows the client name and the services they have with us with a documentation link

I was thinking of created a document library for each client that will hold 'Diagrams' and 'How To' documents

When a staff member clicks on the click here documentation link in the client overview it takes them to a page that pulls in all the information for the client, for example:

• Client Infopath forms


• Client Passwords


• Client Videos


• Client Documents - Diagrams and How To's

When a staff member creates a new infopath form for example Citrix info, they select the client and it says to the forms library, I have created views to filter the client name and then I have added that view to the webpart on client page to pull the information over

I have also done the same thing for the document libraries, I have created two views Client name - Diagrams and Client name - How tos and again added the view to the webpart on the client page

We have over 60 clients so it does not really seem very efficient to create over 60 document libraries, so I thought about creating one document library and then grouping the clients which I can do without any problems, the problem I have is I still need to create two views per client 'Client Name - Diagrams' and 'Client Name - How Tos' to be able to pull the info into the client page but I believe there is a views limit per document library of 50 views and I would need over double that

Is there a better approach to having the views on the client page and minimizing the amount of document libraries?

Thanks