I would say changing to a more consistent work schedule is definitely a good idea, but don't lose the "schedule" part. There's a huge advantage to being able to say "okay, now is work time".
However, after writing that I imagine it's a very personal thing, not everyone will work best in the same way.