It is OK to expect the employer to go by the letter of the ADA, but I think that to really be effective in what you want to do, you need to establish trust and connection with your manager, and the easiest way to do that is to acknowledge that she had good intentions.