Hope you are able to get your situation resolved to your satisfaction, but I do wonder if part of your problem is Expedia also being involved. Whenever there is someone else between you and the airline, it adds another layer of confusion. If nothing goes wrong, it's great, but if something goes wrong, it can be a major FUBAR situation.