The third idea sounds a bit too dramatic. I vote for the second idea. We van easily mix some of idea 1 into it.