What you did first can work if you do it right, but it gets confusing. It is better to recolour the tiles to fit the tileset first, as it is visibly easier to do, replace the tiles in the tileset with your new tiles and then pallette edit in Advance Map.
OK.