I think it all sounds pretty good, I can still grab that link for the list of spells real fast:

http://harrypotterfanon.wikia.com/wiki/The_Complete_Encyclopedia_of_Wizarding_Charms,_Hexes,_Jinxes,_and_Spells_BY:_ME

This is the list with the most amount of spells I can find... Although I'm not too sure about some of them. I much prefer:

http://en.wikipedia.org/wiki/List_of_spells_in_Harry_Potter#W

Its easier and each of those spells has either been mentioned, or used in the HP books/movies. The first one works well if you want to venture off of the more popular spells.