Just curious why those are your only two options?
If it's because those hubs fit with no other modifications, then I think I'd go with the latter. I've been reading a little bit about disassembling the comstars and converting the hub to spoke wheel, however, I've read some negative opinions of this.
People have said that the adapter kits for the comstar are nothing more than adapter plates with holes drilled for the spokes, but that those holes shouldn't be drilled straight through, but at a bit of an angle that better supports the spoke bases.
It is an interesting idea, but I'd be weary considering it will be the only piece holding you up at highway speeds.
I think most people choose an OEM hub designed to be laced and work around the issue of fitting the wheel in the forks, instead of working with a hub that fits and trying to find a way to add spokes