The long 258 tube and dipstick is $140 at dealership.
For the 92 tube there is a hole that worked on the block. No bending required. It is the ground stud bolt hole.
Cost 30 bucks + - 1992 dipstick with new tube.
Dipstick: 53010445AB
Tube: 53020782
Please double check the part numbers.

OR you can use the dipstick tube for a '87 yj with 258 is readily available & the same block as the '86 CJ so the fill mark sould be correct.
Part number: 33007108
Price aprox 20 bucks