Yes they should have. They should also have looked at ways to make this build cheaper to be more competitive to the Japanese bid.
The crew issue is the biggie. I'm not seeing any strategies being put into place to address it either other than chucking a few extra bucks to submariners for their service.