For your elemental powers problem I recommend you research the series known as Avatar the last air bender and the legend of Korra they should give you plenty of ideas.
As for the house Gryffindor thing maybe make it a combination of the Ravenclaw and Hufflepuff houses they have the special rooms and the older students can help the younger students with their homework and maybe advanced charms and DADA stuff.