I think you made an excellent decision... I think ANY other approach would have been more hassle and way more $$$....
OT - For us foreigners who have ZERO cover available from credit cards/car insurance/homeowners insurance etc when renting in the USA the CDW/LDW is quite invaluable... without it we could be up for significant $$$$ in the case of accident/damage.....
Fortunately there are companies that rent at quite decent "all inclusive" rates TO us foreigners.... exclusively... Looked quite strange the first time I saw the upfront declaration "These rates not available to US residents".... (or words to that effect)...