It's hard to call Apple a "hardware company" when they've been making software as long as they've been building computers.

Id classify them as a hardware company because their revenue comes from selling hardware. None of their software offerings are significant revenue sources by themselves, they're just there to complement the hardware making it attractive to buy. They've even made OSX upgrades free. They've been setting themselves apart from the competition for a long time by the quality of their software but that just makes them a better hardware company.

Well, they're not a software company. They make software which is bundled with hardware, not software sold separately, with the odd exceptions.