You don’t work hourly. Stop that.

You need to wrap it into a project. Hourly pricing will always give you headaches and is the worst way to present pricing to customers.

If something takes longer than you anticipated, eat the cost and reprice it in the future or learn why it took longer and fix.

This way, as you get better and more efficient you gain time and your value stays the same.