I used elements of both solutions, so both yours and etaf's posts were useful.
For this spreadsheet I used your second suggestion for public holidays, and a variation of etaf's for having the hourly rate separately, and the formula.

I have just started to use Excel and will probably refer to both suggestions later.