I have been in your shoes many times before Graham, but I advise that you keep working on the current version unless there are some heavy bugs that will be fixed in the following version. Because when a new version comes out usually it will includes some new bugs.