Lovely canaries there.
dont bother with the painted quail as they are thick as shit and always in the way or flying at the walls trying to kill themselves.
on the quail front I would get bobtails, californians or cortunix.
cortunix are easier and you can get some nice colours, italian bibbed are nice, whites or chocolates. They also will lay an egg each a day, sometimes 2 and the eggs are of a size that you can eat