The cannons were standard from about the Mk. V onward. The early Mk. I and II Spitfires, of Battle of Britain fame, were armed only with the machine guns, for the most part. Plus, these guns were spread wide along the wings.
Also like you say, even the Mk's. V, VIII, IX, and so on still carried machine guns in addition to their cannons.