An H-1 would give you more flexibilty to change employers once you are here. However, the earliest that you could begin work here in H-1 status would be Oct. 1st of this year. With an L-1, you could presumably come right away. If an L-1A is possible, that could pave the way for a significantly easier and faster route to a green card.
Also, it is possible that in the not too distant future Congress could pass legislation to allow same sex spouses to confer derivative immigration benefits on each other. Check out the website: www.immigration