You've got a nice list there. Generally speaking, it's best to be eating/drinking stuff that's appropriate for fairly strenuous physical activity.
In practice, the kind of food you eat will depend on the kind of diving that you'll be doing.
If you're diving off of a boat in rough seas and/or you are prone to seasickness, eat very little and make sure that what you eat is bland. For breakfast, I recommend bagels. Stay away from anything greasy.
A couple of years ago I joined up with a local dive club that went down to Mexico for a very enjoyable weekend in La Bufadora. The coordinator cooked up a storm on the morning of the first day of diving: pancakes, eggs, bacon, sausage, etc. Later on that morning, our panga (small fishing boat) had a few divers who had indulged themselves a little too much during breakfast and ended up feeding the fish during the surface interval.
For shore diving in our normal local conditions, I won't modify my normal diet at all.
Something else to keep in mind...
As a novice diver, you're expending a great deal of energy once you get into the water. You're also probably more tense/anxious than normal. As you gain experience, you'll realize that diving can be an effortless pastime. Under the right conditions, it can be almost a meditative experience.
Have fun and dive safe.