Like you I am trying to structure my prices better.
T&M penalizes you because when you work faster the less money you make. With T&M the customer will compare what they make per hour with what you are charging. They will not think about your lost time, insurances, overhead costs etc.
Start to track your times so that you can develop accurate costs and times so that your future estimates accurately reflect YOUR cost of doing business.
