OK - so how about a Canadian version of Thyssenkrupp's U218SG?
1 completed, 2 scheduled for completion this year, and 1 scheduled for completion in 2024 for Singapore.
Displacement 2,000 t (2,000 long tons) Surfaced; 2,200 t (2,200 long tons) Submerged.
Endurance 28–42 days (4-6 weeks) days underwater, without snorkeling (thanks to AIP).