Yes AG products are pain with plastics and can be hard to remove and cause plenty of dust, but they both give good results and fill defects.
NXT 2 could be a good choice.
Or if you really want to fill, but have arms like pop eye turtle wax colour match!
