Doesn't seem fair to call something a deserved hit if you don't know the full profile. Taking max depth and assuming square doesn't seem right to me.
Regarding the "short" 40+ minute surface interval, what's wrong with that? Even assuming a square profile that doesn't put you into the W, X, Y, Z groups that PADI RDP requires a 1 hour SI for. I know the boats I go on < 1 hr SI is normal. 1/2 hour to get to first site, 1 hours in the water, 1 hour to get to the next site, 1 hour in the water and 1/2 hour to get back = 4 hour charter. It doesn't always go that smooth so 45 minutes is likely.