but Anakin's Theme was playing during that scene, because it was that anakin was "falling in love" with padme.
That's correct... from a certain point of view :p And even if I'll leave Anakin's Theme in the angel scene, I will surely put AtS in the gift scene instead of his theme, where Padme says she cares for Anakin. It's like playing an imperial cue during discussion of Anakin's future.