Simplest solution Ive found to that is just keep the gun I carry in its holster, in my pants (fireman style) ready to go, right next to the bed. Everything I need is in them (light, reload, knife, etc), and I can have them on faster than you can get up and open a safe.
We also have a couple of handgun safes in parts of the house that are away from things as back ups. They get their batteries changed once a year when I change out the batteries in the red dots on a couple of rifles I normally use. They also all have a piece of tape on the door with the last date they were changed. They dont get used much either, just randomly checked here and there throughout the year, so the batteries really have no load on them and are basically fresh.
You were lucky and had a proving drill and found some weak points. Address them and move on.
Just a thought here, but layering your alarms so no one gets even close to the house, let alone, through the door, and if possible, having a large, furry, and aggressive to the uninvited roving security team inside, will give you some time to wake up, get some coffee, and wander down and see what all the ruckus is about, should someone actually get through the door. Coffee clears out the cobwebs nicely and makes the safes easier to open too.