I love both of these but I adore the Hogwarts one more for one major reason. You didn't put Rodney in Slytherin. It seems that most of the people I come across insist that Rodney is an obvious unquestionable Slytherin.

Personally, I feel that Rodney's character arc in SGA is him adding Gryffindor and Hufflepuff traits to the Ravenclaw traits he already has. The Return I being the best example with Rodney missing being on a gate team and not enjoying being at Area 51.