Sounds good. Just keep in mind that stacking a CPL onto an ND on the 16-35L will most likely give you mechanical vignetting on FF. At 16mm on FF, 8.5mm mount thickness increases optical vignetting, 10mm mount thickness and more gives mechanical vignetting - not sure about Hoya mounts, but for B+W a regular filter is 5mm and a regular CPL is 8mm. So, while the solution you propose will work on your current camera, you may not be as happy with it on FF.
I agree that I'd prioritize the CPL over the ND, but you may want to consider the 10-stop over the 6-stop. That comes down to why you want the 10-stop. Personally, I use it mostly to 'eliminate' people from scenes, and sometimes for cloud motion - the longer the exposure, the better. For things like waterfalls, you will likely find the CPL alone is enough - keep in mind that with FF, you basically gain an extra stop since current FF cameras have an ISO 50 setting.