Tektro hydraulic. I took the bike back to LBS again today. We repostioned caliper again and talked about bedding in the pads and possible contamination on the rotor. Owner of LBS rode my bike and I rode his. I think we had a combination of small things that needed to be tweaked and maybe I needed to have different expectations. That being said, I plan to pick up some brake cleaner today.