1. For last year ITR, you can wait for more 10 days, if nothing comes then again file grievances.
2. Apparently, You can follow same approach for filling the current year return. More accurately can be seponmded after looking into file. If you want I can help you on that