Now that a lot of colleges have waived off the GRE requirements, should I spend the next 2 months preparing for GRE or on shortlisting colleges and preparing my SOPs?

It all depends on your profile, CV, resume, academic credentials, extracurricular activities, and so on. If these factors result in a compelling application, it is preferable to forego the GRE. The GRE is one of the most important entry requirements for students planning to pursue an MS degree abroad. Students will be evaluated on a variety of factors now that some universities have waived GRE scores for Spring 2022:

Academic Qualification
Work Experience
Internship Experience
Letter of Recommendation (LOR)
CV
Resume
Statement of Purpose (SOP)
So I guess it is better if you would concentrate more on your SOPs. Universities have different admissions seasons. Fall and spring are popular intake seasons. There are a limited number of admission seats available for the spring intake. Here are some universities that you can target:

University of Arizona
Rice University
University of Wisconsin-Milwaukee
Florida State University
New York Institute of Technology
California State University Long Beach
Northeastern University
The University of Texas at Austin
Stony Brook University
Suny Buffalo
University of South Mississippi
New York University
Texas A & M University
If you have any further questions just ask me.