Recent service visits have been disappointing but ...

Recent service visits have been disappointing but this *last* encounter was infuriating. Between keeping my car for three days (requiring me to rent a car), paying for and being told a problem was fixed (it's still not), and being upsold (I'll embarrassingly admit I gave in to the salespitches) to the tune of a $1,600 final bill plus $360 rental. Now I'm looking for a good mechanic to honestly address the original problem.