Your question resembles a software program. OK, first of all you cannot use H-1B from 2004 because it is not valid anymore. If you have only 3 weeks left short of 6 years, you will be admitted only for that duration when you enter using . Did you take any vacation time during ++? If yes, you can try to recapture that time by filing an extension. If not, then you are out of option and you will have to stay outside for aggregate of 365 days to again reenter in either H-1B or L-1, unless you have a pending labor certification/I-140 (pending >365 days) or approved I-140, then you can request 7th year extension.
I agree with my colleague.
PROFESSOR OF IMMIGRATION LAW for over 10 years -- This blog posting is offered for informational purposes only. It does not constitute an attorney-client relationship. Also, keep in mind that this is an INTERNET BLOG. You should not rely on anything you read here to make decisions which impact on your life. Meet with an attorney, via Skype, or in person, to obtain competent personal and professional guidance.
No, you cannot use the 2004 petition.
You must be outside the US for at least one year to reset the H-1B clock.
J Charles Ferrari Eng & Nishimura 213.622.2255 The statement above is general in nature and does not constitute legal advice, as not all the facts are known. You should retain an attorney to review all the facts specific to your case in order to receive advise specific to your case. The statement above does not create an attorney/client relationship. Answers on Avvo can only be general ones, as specific answers would require knowledge of all the facts. As such, they may or may not apply to the question.