The prostitute woman of Revelation 17 is not the same woman of Revelation 12.
I agree with you, as does John the Revelator.