What would you include in a 1st year curriculum?

[mehndimama]

I think I'm in a rather unique situation - my 11 year old son, who 
is a non-directed learner (we homeschool according to John 
Holt's "unschooling" principles), as expressed disappointment that 
he didn't get his Hogwarts letter last month. :D I sort of jokingly 
said "Hogwarts isn't the only wizarding school, you know...." and 
asked him if he would really like to do his first year of wizarding 
school, even though some of the stuff would be difficult, and he 
said YES.

Soooooo.....what would you include in a curriculum like that?  
Here's some of my ideas:

Combined herbology/potions, leaning how to make his own herbal 
medicines (which he uses frequently anyway)
Wandcraft, learning the different properties of woods, their 
symbolism and mythology, and making a wand from a carefully 
selected combination of woods.
Astronomy/astrology - my mom has already given us a terriffic 
astronomy guide with a rotating star chart, and we have a good 
telescope, and I have a current ephemeris and some astrology books, 
which he shows an inerest in.
History of Magic - we got the  Magical Worlds of Harry Potter & The 
Sorcerers Companion from the library - I'll read through them & see 
if they'd be worth buying.
Charms/Defense Against the Dark Arts - learning about historical 
charms, amulets, hexes, and other defensive spells and their 
context, along with some survival skills

I'd like to hear of any other ideas, or good age-appropriate (or 
semi-appropriate, anyway) resources for what I've already got 
listed.  Books, websites, free software....whatever. (I just ordered 
Rosemary Gladstar's Family Herbal - so I've got a good start there.)

Becky (Professor Stellaria)
Mama to 4 devoted HP fans and proud supporter of Neville Longbottom