Workspace Macro Pro 6.0 provides a very powerful feature called 'Group by windows'. It will display all your recorded actions grouped by windows. This makes it easy for editing.