How about one of these Tange headsets: http://aebike.com/product-list/tange...00-m2386-qc30/ Inexpensive, and should look nice on your Nishiki. Being traditional ball-bearing models, they'll tolerate imperfect head tubes to a fair extent.