The problem described by the OP largely goes away when you stop charging by the hour.
Often though this up front time working on an estimate can end up being for free, an opportunity cost really, if you don't win the project.
Charge for a discovery phase. Your requirements gathering skills and planning for what to build have very significant value.