Again, in Job 1 & 2, Satan was not "UP IN Heaven" in those passages. When he answers, he merely states (answering the Q, "whence comest thou?" / "from whence comest thou?"), "From GOING TO AND FRO in the earth, and from WALKING UP AND DOWN in it" (that is, goin' all over the place, and now he's come to one particular location where Job resides and stations himself THERE). If he'd merely stated, "from THE EARTH," then this would imply he's located elsewhere now (like, in the air, in Heaven, on the moon, anywhere else but earth, etc), but he did not say that. (Again, this is just ONE of the indicators in that context that shows it was not "UP IN Heaven"... there are more.)
So eliminate those two references. Where else does it say they ("sons of god") were "angels" (I disagree that Scripture states this).