Editor and Writer - Self-help Psychology

I'm looking for an Editor for a self-published self-help book which is 21,408 words. It has already gone through 1 editing process but I want to improve it. I need an editor who also has writing skills as I need someone who can provide a file with the suggested changes and another file with the changes made.
I'm happy for the proposal to include a fee for editing and an additional fee per hour for the writing as you may not know how much rewriting is needed at this stage.
Please could you also give me your estimated turnaround time.
Thanks!