I have been giving serious thought to one of those racks that lets me store my handguns standing up with the grip facing out. Something like this one,
There are issues with the size and shape of several of my long and short-long guns. My .308 takes up the space of three rifles with it's oversized bolt handle, scope and McMillan stock. My SBR and SBSs aren't tall enough to fit into the racks so they must lean against the sides and the back. To avoid bumping guns against each other in the safe, I have had to sacrifice a few spaces around the guns that get shot the most often.