My two items to purchase this week for long term storage are olive oil and peanut butter. For the oilive oil should I go with glass or plastic and should I get extra virgin or regular virgin? And should the peanut butter be in glass or plastic? I'm buying the REAL peanut butter that has the only ingredient of peanuts.