I dislike both options. 2 solves nothing and causes confusion, and 1 worsens the problem even more. I think that the games should be 60% in-division, 39% out-division but in-league, 1% interleague. Either that or 2% interleague. Interleague was, at it's start, a gimmick to increase sales. Leave it a gimmick, and have only 3-6 games per year be interleague. Not only that, but if I'm seeing interleague, I don't want to see Mariners-Nationals. The Interleague games should be between two teams that either share history or are hated rivals, like the Yanks-Mets, Phils-A's, Nats-Orioles, or RedSox-Braves.
I also want to introduce something, I don't know if this has happened yet, but how about as part of the All-Star game fiasco, you have the winner of the MLB all-star game play the AA or AAA all-star winner. That would be interesting to see, and it would set the true MLB prospects out from the guys that just are good in AAA.