Me filling in my 'Personal Development Plan' every year with waffle and screaming to myself inside "I just want to come to work, do my job, get paid and be left alone".

The only problem with this scene is that it makes it look like being a Scotland fan could be fun. Sadly, as I can attest to, it really isn't as enjoyable as those 30 seconds shows it to be.

Is that better than this?

You're right. I don't know if the Whittaker role was poorly written, because he's excellent as the duplicitous creep Chief Karlin in Fletch.