I'd go 1" for sure on the frame headtube. 1" steerer forks threaded and threadless aren't hard to find, and you can use a 1 1/8" stem on a 1" steerer using a $5 shim.