Bit late to the party, but per the MTOE for the 2nd SOL per NAIS 4SW Vol 1, that regiment in particular fielded a heavy, medium, and light company per battalion. By comparison, the same outfit, in 3013 (per Kell Hounds sourcebook), fielded a generally similar average weight, but with the companies not as homogenized--lots of companies composed of heavy or assault, medium, and light lances.
Also in the 4SW, the 5th SOL had four battalions, featuring in sum total a single assault company, three heavy companies, four medium companies, and four light companies. In 3013, that unit was substantially similar, with one battalion having companies composed of one or two heavy lances and a light lance.
Long story short, your latest rendition seems plausible and evokes the right feel; that is ultimately most important, not so? The guiding light behind DCMS 3rd and 4th SW periods is a profusion of heavies and lights with a smattering of assaults and mediums. Oh, the PPC-armed Catapult isn't strictly a 3030s-only machine; it existed since the first printing of TRO 3025 (though they were more rare in that tome than they were in my games once I found out RPE made them...).