Yeah those stock caps kind of suck. I ended up modifying and putting on some extra FJ ones I had... Still have not found any good Nissan logos to put over the TRD.
Maybe put some dabs of silicone where they hook on and let dry. then if you ever need to pull em off just break the little beads of silicone.