I would suggest you stop thinking you're self-employed, but rather you're running a business - and run your business like a corporation runs its business. Everything should be billed for - from workshop/storage/garage/desk space etc. vehicles, insurance, tools, equipment, waste removal, and...