Non-dipolar gauge links for transverse-momentum-dependent pion wave functions