AutoCAD Civil 3D :: Layer Freeze With Structures Using Outer Part Boundary?

I try freezing my proposed storm structures inside Viewport for Existing Conditions sheet.  My proposed DI's freeze because they use a block (in structure style).  My proposed headwalls use the outer part boundary from catalog.  BUT both DI and Headwall Style Component Layers are set to C-STRM-STRC. 

In the pic for Existing Conditions Layout, you see a white headwall boundary.  In proposed layout, you see a magenta headwall boundary. It's using the Object Layer and not the component layers for the headwall.

 I didn't see another way to logically set up Object Layers for Pipes and Structures that contain Existing and Proposed Water, Storm, and Sanitary.  My Object Layers have Pipes set to C-UTIL-PIPE and Structures set to C-UTIL-STRC, BUT the Component Layers inside the style are specific.  Example: Existing Storm Structures and Pipes have layers such as V-STRM-PIPE and V-STRM-STRC.  Proposed Storm would have Component Layers such as C-STRM-PIPE and C-STRM-STRC.  The Object Layer for both existing and proposed use C-UTIL-PIPE and C-UTIL-STRC.