While I'm uncertain of the cause of your columellar deviation, it appears that either the end of the septum or a graft at the end of the septum is bulging into the right nostril, and this is the likely cause of the deformity. The methods you mention are all considered and may all be used at once. Please consult with an experienced revision rhinoplasty surgery and they can evaluate these issues for you. Good luck.
Caudal septal deviations are very difficult to correct. If the cartilage is simply dislocated off of the maxillary crest, it may be repositioned. However, many of these problems involve cartilage that is dislocated AND warped. The correction of the warped aspect of the cartilage is where the difficulty lies. Correction may involve cartilage grafting or the use of synthetic grafts (PDS plate) to straighten the caudal strut. It would be important to personally consult with a board-certified Plastic Surgeon who has a particular interest in Rhinoplasty.
Deviated caudal septum
Caudal septal deviations are much easier to fix in primary surgery than revision, simply because the amount of available cartilage limits what you can do. For primaries, I have grown to favor a caudal septal replacement graft- excising the base of the septum up to a straight portion, then make a big replacement graft and secure it to the nasal spine and remaining dorsal septum, with spreader grafts to stabilize it.
In your case, some combination of judicious excision and a wright stitch would help. Tongue in groove I don't think would help and in fact would make your nasal tip deviated too- the septal cartilage is stronger than the cartilage of your medial crura, so it wins. You could still have a replacement graft, but likely you'd need rib cartilage.
This is tricky. Be sure to visit with someone who's experienced with revisions.