Here are my thoughts......
Do what Ryk and roadworthy said or swap your entire front end out for an hd- you'll need to have a new stem made but you could possibly get away a bit cheaper- hd front ends can be picked up cheap at swap meets- last month i picked up a 35mm super glide fronted with a 21 on it for 80 bucks- deals are out there, just gotta be patient-

If you do go the america hub route, they are 36 spoke- keep that in mind when buying a hoop-