Yes, you need two waivers.
(213) 394-4554 x0 Mr. Shusterman is a former INS Trial Attorney (1976-82) with over 35 years of immigration experience. His response to your question is general in nature, as not all the facts are known to him. You should retain an attorney experienced in immigration law to review all the facts in your case in order to receive advice specific to your case. Mr. Shusterman's statement above does not create an attorney/client relationship.
Consult with an experienced attorney. It is almost always better to re-file, so as to do a more thorough job documenting the hardship than in the applications which were denied.
This general information does not establish any attorney-client relationship. There may well be factors not mentioned in the question which could and should be addressed in an attorney consultation.