I’m not sure I’m following the order of scenes you have in mind. If the fireplace scene is to be retained, it would be best to leave the original transition into and out of it.

TAS basically replaces the original kiss by the lake scene with the Padme’s family deleted scene, then uses the kiss later to replace the fireplace scene.

What order of scenes do you want to have? Let me know and I can try to make that happen, but it can be rather tricky to get a decent audio transition and sometimes that limits what I feel good about.