I would go for a mix of option 2 & 3. Mostly because I want more Ginny.Having more characters also gives you more options in scenes that wouldn't make sense for the main 4, like quidditch or other specific activities.