I wouldn't mind a new avatar, but I'm hoping for dialogue options as My Unit from Awakening already had a set personality.
As long as they're important to the plot, waifus aren't so bad. After all, marrying your favourite character is actually quite nice! :D
..but if it's too much effort to write individual supports for every character, then limited supports are fine as long as they focus on a better plot imo. If so, there's always fanfiction to fulfill your desires.