I think what I would try, is to make it so pieces which are correctly locked together, slide together. That would mean moving pieces across multiple rows/columns, but I think it would be worth the complication. Or maybe something where you can manually lock a piece in place, and things slide through it?