So, once again, the lesson here is: don't guess, don't assume, don't necessarily trust what an attorney tells you - he may or may not have his financial interests ahead of your legal protections. A will is merely a "serving suggestion" and is by no means legally binding. It is not easy, but you should do your research, and read the pertinent federal, state, and local laws and regulations regarding benefits, estate, and inheritance. The horror stories abound. Don't become one yourself.
Also, whether you are gay, bi, straight, or any other part of the spectrum, voice your opinions to your state and federal representatives regarding survivor benefits. Non-married straight couples are at risk. Gay couples, whether legally married or not, have so very few legal protections.