Yes, you are correct this would be an electrical issue. Your problem would either be in the headlight switch, or the relay. If you can only get them to turn off after 20 minutes, I would steer towards the relay being the problem.
__________________
If this helps, please ACCEPT. In not, send me a reply and I will help you further.
