Hi!
I strongly suggest entering your foods into a program like
www.nutridiary.com .. this will make it easier to know if you are reaching a calorie/macro target.
I recommend you check out the nutrition info on my site (see sig), and try to work yourself up a menu based on that.. a weekly menu is great.
I'd also go with between 1600 and 1800 daily calories depending on your activity level and whether or not you think you have a fast or slow metabolism.
For preworkout, have at least a whey shake with milk + some oats or other carb. For postworkout, you should right away have a whey shake, and some fast carbs.. a banana is ok here. Then ~1 hour later, you will have your supper.