Desi145
Hi Desi145,
I'm in about the same situation as you are, but I'll do AOS for three reasons:
1) I have an old I 140 approved, so I should be able to use the old priority date. I'm don't know if it really changes anything or not.
2) I'm going into my 7th year of H1B too. And I'm not sure I'll be able to keep extending the visa if I go for Consular Processing.
3) With AOS, we can get EAD, and portability after 6 months
So in total it looks safer to go for AOS, but there is no clear cut as to what you should choose.
Good luck, and let us know your choice...
t3k