Options for stripping S-Tags on Arista from an ENNI?

Currently we have a number of ENNI interfaces with Q-in-Q traffic from our different sites that are passed into our network from our carrier provider. Our existing hardware can currently terminate the traffic without stripping the S-Tag from the traffic coming into and leaving our network via the ENNI interface.

In the process of upgrading our network equipment to provide additional capacity, We've sourced a handful of Arista hardware -- Particularly, two Arista DCS-7280QR switches to provide gateway connectivity via an SVI per VLAN where routing to transit/peering connectivity is necessary, and two Arista DCS-7160 switches to provide access and aggregate traffic from the ENNI interfaces via a cross connect.

Unfortunately in the process of preparing to put the hardware into service, we've noticed that the existing access switches do not currently provide (from what we've seen so far) a usable method in which to strip the S-Tag from the Q-in-Q traffic, nor do the gateway switches provide the ability to attach an SVI to the C-Tag (or strip the S-Tag to allow an SVI to attach to the newly translated C-Tag).

In the process of labbing this particular issue, the only use case that we've found to function so far is utilizing one of the DCS-7280QRs to remove the S-Tag, while a second DCS-7280QR can then attach an SVI to the freshly translated and unencapsulated C-Tag. Unfortunately, this won't be a viable option to pass traffic between the two 7280QRs, as this would then nullify any sort of high availability scenario we put together as traffic would then require both 7280QRs to be online and functioning at all times to work.

My question at this point -- Is there a simpler way to strip or remove the S-Tag and attach an SVI to the C-Tag traffic? Am I relegated to replacing the new access switches for a switch that can manipulate and remove the S-Tag as it leaves the cross connect to the gateway switches? And further, what other options might be worth looking further into to provide translation and removal of the S-Tag so the gateway switches can attach to the C-Tag VLANs, especially erring on the side of cost effective?