Well... you can start here... http://www8.hp.com/us/en/products/data-storage/storefabric.html
Look for the multipurpose/converged models for your first option.
The question you need to ask yourself is... how many Fibre ports are needed now and lets say 1 year from now... and how many LAN ports re needed now... and lets says 1 year fro now.
The last thing to consider is the fact that you have 6 entry level storage arrays. Perhaps it is time to think about getting an expandable replacement for them... something that can be grown beyond the capabilities of an individual MSA without investing in new controllers every time you either reach the max config.
Also worth checking into... is the configuration on each MSA. You can add addition disk shelves to each unit expanding capacity per array... if you have not done that yet.
For option 2, the "entry level" hardware is probably sufficient as well, but you still need to ask the questions... how many ports now, how many more in the future... etc.