Just what nni said- post should be carbs and protein. A lot of people will argue that quality isn't too big a factor. I happen to be a health nut, so I disagree. I would say isolated whey for protein, and I have heard good things about IDS Waxymaize.
As for pre-workout, get jack3d by LSPLabs...good stuff!