...
So I cleaned up the deprecated things, and still nope. I still think there is an issue with the flow specific metadata for 47.
Delete a Scratch Org
Weird Things
The end goal for me would be to create a scratch org that I am happy using that has all my standard modifications in it (eg as shown in New Salesforce Org).
...