My final trip plan - fuel question

Hello All This is my trip plan in September 2025 and please advise: #1 where I can get gas after Walvis bay but before Hoada Campsite. #2. Also, I am thinking of spliting Hoada 2 nights into Hoada (1 night) + Mountain peak game lodge (1night), any advise? Or move to move to mountain peak for 2 nights instead of Hoada! Trip plan Windhoek (arrival and 1 night) -> Swakopmund (2 nights) -> drive to Torra bay -> Hoada Camp Site (2 nights) -> Estosha national park (2 nights) -> Solitaire (1 night)-> Sesriem camping (2nights)-> Windhoek (1 night and then to Botswana). Thank you very much