I think you are ok. As long as you submit your H1 application before OPT expiration date July 9th 2009 or within 60 days after it, you should be ok to stay in US to wait for your H1b.