Hi Chris,
Either of those two should do.....
NXT does have light cleaners and fillers, as does the step 2 'polish' (which is more of a glaze), which should do some filling too.
If you can wait an extra day then go for something like Prima Amigo Polymer filling glaze, or either Clearkote Vanilla Moose wax or Red Moose Glaze.
Cheers.
Alex.