The whovian in me screeches the toymaker came first, the trekker points out that while Q seems to have some peculiar moral purpose the Toymaker is just an eternal ancient who sets shit on fire for fun.
Also supernovas can harm Q IIRC. The Toymaker, not so much.