Not a very active thread anymore..
Fixed the headset issue. Took it all apart and noticed the top bearing had a little play in the headtube cup, so I swapped it to the bottom and the bottom to the top. Both fit much better this way and eliminated the little bit of play that I had.