Yup, buy a universal kit and get some Hella E-code enclosures. The enclosures ensure the light has the legally required cutoff (so you're no blinding other drivers and don't get hit head on) and they provide MUCH better light distribution than any cheap "crystal" housings you'll find... plus, like I said, the proper cut off is a federal regulation and tickets suck (especially ones you can't fight and win). There are plenty of kits out there, a few of the vendors over on SM sell them, IIRC; and I'm sure at least one of the vendors here can probably get some:
http://www.toyota-supra.info/forums/authorized-vendors/