I am not an evaluator, but I stayed in a Holiday Inn Express last night!
I think opting for #1 was the best way to work through this as much as possible; especially if you do not know what your evaluator was looking for. Some of the more senior officials (Read: Evaluators) will give you more insight about differing philosophies.
To me it appears you made the most of a difficult situation.