What is the approach for experience bundles and org shapes?

We are forced to use org shape to create scratch orgs due to license limits. (unlimited license vs enterprise license)

The customer uses experience bundles, which can't be deployed to the scratch org due to a known issue:

Can't create a Digital Experience Cloud Site Using Org Shape

Description: When you try to create a scratch org from an org shape that contains an Experience Cloud Site, you get an error.

Required fields are missing: [Welcome Email Template, Change Password Email Template, Lost Password Template]

Workaround: None.

What would be the recommended way in managing this?

1. Redesign to stay within enterprise limits

2. Use sandboxes instead of scratch orgs

3. Split functionality into packages and use different setups for different functionality

They all seam like sub optimal options. Is there still work done on the known issues? Feels like a big issue not being able to use experience bundles.