I like this design a lot; I'd like it better if you had a couple of lines explaining that you were running both queries as a conversion model, and that this code can probably be tweaked when we're comfortable that the migration is complete.