I may have answered my own question, but want to confirm.
If you make the election to file jointly with a nonresident alien spouse, then you elect to choose to treat the nonresident spouse as a resident alien. Thus, it seems you just use Form 2555.
Thoughts appreciated.