IMO dump the peanut butter and the protein shake. Try to keep your fat intake down, and don't worry about the protein. I've made huge gains in muscle and strength since joining a gym. Bench press 1 Rep Max up 178% since March. I eat 1500 - 2500 calories a day (probably closer to 2500 a day here lately) and typically 10% - 15% of that is from protein.
This study pretty much says that protein supplements don't work http://www.ncbi.nlm.nih.gov/pubmed/16948480
, although I've never try and argue that on the body building forums.
"People eat meat and think they will become strong as an ox, forgetting that the ox eats grass." - Pino Caruso, Italian Actor