Right.
Changed my approach.
In a nutshell: i treat friday and saturday like any other "hard" Holiday, a.k.a "non working day"
I created a View "NonWorkingDays", consisting of a FULL OUTER JOIN of a Calendar CTE only grabbing fridays and saturdays and the holidays in OCA, with Holidays taking precedence (a holiday can be on a friday or saturday).
The "Range" of the Calendar CTE is StartOfYear of today ('2023-01-01') to Today + 2 Years ('2025-07-21')
The View can be change to be more "dynamic", e.g. Today -1 year to Today + 2 Years ('2022-07-22' to '2025-07-21').
In that case "Old" View must be dropped and recreated a new
Field DREP in VAC2 has also been changed incl. both Triggers for VAC2
Basically: If ED+1 hits on one of those days, the Offset OS gets increased by 1, and DREP bascially boils down to EP+1+OS