Trump is not helping himself. Clean house with staff, get rid of the establishment GOP Reince & others brought in, and go on the offense. He needs to set the narrative. Also, he needs to shut up about Russia. I hate to be blunt, but say absolutely nothing at all about the investigation. Create his own news.
Your first statement is correct. But you were probably thinking the narrative should be tax reform or something like that. I think a better narrative is to harp on the Russia thing. Tweet about it every single day. Make the media talk about every day. It's a perfect foil because it wastes all the enemy's time at no cost. That's because there's nothing there and the American people know it.
There was (1) Obama using the national security apparatus to spy on political opponents and (2) a policy dispute over whether Russia should be an enemy (neocon preference) or an ally against ISIS (America-first preference).
Those two things are the only facts in the case. After 12-18 months and millions of dollars spent on investigations, we will be left with just those two facts.