The 216 should not be a problem, especially if the subject is a new construction. They are trying to establish replacement reserves. It is more relevant if the subject is a multi unit vs SFR.
The 1007 is more relevant (in my opinion, in my experience based on my fee I have seen the 216 often get cancelled, but not the 1007, although this depends on the lender).
***Tip*** Look into SPARK, it is an online appraisal software that will populate your grid with comp info and rental info. The 1007 becomes less of a hassle.