Both experiments used a combination of all significant channels for both the discovery and further measurements, though the most significant was the two photon final state.
If a collider were built to study just the Higgs boson, it wouls probably be an electron-positron collider, with at least $m_Z+m_H$ energy, where $m_Z$ and $m_H$ are the masses of the Z and H bosons, respectively. Incidentally, this threshold is only about $216~\rm GeV$, barely more than the LEP II experiment that failed to discover the Higgs boson! See the related question Could LEP II have discovered a 125GeV Higgs?
As you can see from the following plot (from the LHC Higgs Cross Section Working Group), the primary branching fraction of the Higgs boson is $\rm b\bar b$, by a good margin. This is a difficult channel to use at the LHC because the LHC is a hadron collider, and all of the quarks involved in the interaction make a huge mess of things.

The Higgs boson is several hundred more times likely to decay to quarks than to two photons, but it's almost impossible to see through the massive quantities of quarks produced in other reactions. The two photon channel is rarer, but much cleaner than the more common channels.
A lepton collider does not suffer from these issues. An electron-positron collider has somewhat of an issue producing Higgs bosons, since the Higgs couples to mass and the electron is still light. Significant production is possible above $m_Z+m_H$, however. Since a lepton collider is much cleaner, the $b\bar b$ channel is much more viable for studying the Higgs, although all significant channels would almost certainly be used to improve the statistics and do specific precision studies.
The absolute ideal machine to study the Higgs boson would be a muon-antimuon collider, since muons are much heavier than electrons and so couple to the Higgs more strongly. This means a machine that can produce many, many Higgs bosons very quickly. The technical difficulties of producing, accelerating, and colliding muon beams inside their $220~\rm\mu s$ lifetime means this is unlikely to come to fruition anytime soon, though.