Correct, I advocate for a single team running both, discovery and delivery.

My tactic is simple. The Product Trio works 80% doing discovery and 20% delivery, and the rest of the team 80% delivery and 20% discovery.

You may think that's crazy, but I've observed that it creates the necessary balance between future and present. Teams uncover opportunities while delivering value frequent enough.

Hope that helps.