I think it is OK now. The other one is just as I intended (I mean the short 10 moves solution). It requires a bit of different thinking, so I think it should stay as it is.
Although it does seem to be the same solution, the ungrouped version is slightly easier and i guess S's intention was to make it harder. If you ask me this version should be the accepted one and not the other.