Keeping the original sender units , makes it a hard problem to solve.
With the fuel gauge , you could buy a nos civilian gauge , like this one
https://www.ebay.com.au/itm/29611872...ynydbJhkBXieyG
Remove the bezel / glass from your jeep gauge, and remove the internals, then trim down the civilian gauge , or make a new black face for it , and install it inside the Jeep gauge body.
It's a Australian seller , the AU dollar has been gaining value recently , a few months ago, it was more of a good deal.