Don't be afraid to add that much wanted shelf space. Hide the angle irons with a couple of corbels and trim the shelves with flat molding.