1) my hosting (where I get my hosting from) is set to (non-www version)
2)while on web master tool analytics property i have (www version) linked to adsense

I see that It would be a problem.

Solution 1)Now I have 2 choices. I can either redirect my hosting from (non-www version) to (www version)

Solution 2) Or I can unlink (www version) on adsense and go to web master tool and change it to (non-www version) and that way it will match and relink and thats solution 2

So change it at my host OR webmaster tool?