Both ideas are pretty old (50s) and in development for a long time. Both designs have their pros and cons. The biggest drawback of the Tokamak however is that it can only be pulsed... which is kind of dumb to actually generate and provide energy in the long run. You really want the Stellarator here, since there it is at least theoretically possible to run "for ever" (not entirely true, but long enough cycles to be used in a power plant).

There are 2 podcast episodes with the guys who run Wendelstein here: http://www.alternativlos.org/51/ (it's German tho)