Now that they've legalized marijuana, maybe they will move along to less important matters.  Or do they pass a budget and then go home?  

You can file now and maybe amend later.  You can file just the federal, and hold the state.  Or you can hold both. Have you presented the choices to your clients and asked them to decide?