Don't step backwards my friend. If your ultimate goal is to stay in US, why do you want to work in OPT instead of filing H1B. If your employer is ready to file H1B and will not fire you soon, its better go for it. Its better you file GC within a year or so after H1B. 

Good Luck!!!