Please help me review my Jaisalmer itinerary

Thanks in advance. So my wife and I are visiting Rajasthan for a week, and we have 3 days in Jaisalmer, which we have planned like this Day 1 Arrive in the morning using overnight bus from Udaipur Explore the Fort in the morning and Gadisar Lake in the evening Overnight stay at a hotel Day 2 Explore Patwon Haveli in the morning and proceed to the sand dunes in the afternoon for safari and overnight stay Day 3 Leave the desert camp and travel to Tanot Mata Temple and see the Indo Pak Border Return to catch the overnight bus to Jaipur I think the plans for Day 1 & 2 are easy enough but worried about Day 3. Do I have time to travel from desert camp to Tanot Mata Temple and come back to Jaisalmer by 6 to catch the overnight bus? Heard, the total distance would be nearly 300 km up and down. If possible, will we get rent a a car service in Jaisalmer?