I ended up watching the last 2 sets of the Berrettini match. First time I've actually seen him, although I am aware of his great year and rise up the rankings. He was often playing catch up and for a lot of the time looked more likely to be broken, but he was so clutch and saved a lot of break points, and he did have the serve to get him a lot of free points, which Diego doesn't have.
Not sure if he'll be able to live with Federer on Monday, but I'll definitely be tuning in for it.