A lot of your observations are correct. The SubCompact will use the same decocker levers and slide catch, though it normally comes stock with a low profile slide catch, anyway. The hammers are the same in the different Storms, but the struts are different in a SubCompact. It will take the same hammer spring, though.
You are correct that the hammer assembly unit is different in a Sub. It seems to go by different names... confusing. It is a hammer assembly unit in Beretta speak. Some call the competition version a competition trigger group because it will help single action trigger pull. But, it does not contain a trigger or trigger bar. In Gunsmith terms it is a fire control group. A rose by any other name...
You could find a part of interest here:
https://www.brownells.com/schematics...sc-sid878.aspx And see if it is the same part number as here:
https://www.brownells.com/schematics...ct-sid928.aspx Or here:
https://www.brownells.com/schematics...x4-sid879.aspx to see about any other parts that come to mind. Brownells is Beretta’s official distributor of OEM parts.
On the schematic a little number will be next to a part, click on it and it will show up below the schematic. Remember that parts found on the PX4 full size page might be for Type C or D and not compatible with Type F or G.
The spurless hammer can be found at
http://shop.langdontactical.com/products/