What is the optimal 'loadout' for Lydia?

Lydia initial skills are as follows:

• 76 One-Handed
• 72 Heavy Armor
• 58 Block
• 53 Archery
• 44 Two-Handed
• 20 Smithing, Light Armor, Speech
• 15 Lockpicking, Sneak, Alchemy, Alteration, Conjuration, Destruction, Illusion, Restoration, Enchanting

You can get your followers current skill, though I'm not sure if they are upgraded, using Ask Follower Skills mod by melbourne47. The layout in my screen seems to be broken but it looks like this:

The optimal loadout for Lydia at the beginning is the set you suggested but it might be different if she's been using Two-Handed for a while.