Rubio pushes ahead with school choice bill