Inshallah it will be better , in fact any thing came under you will start performing better
, App hain hee itnay achay (H)
Regarding average also used the old style wagon driver method fill the tank all the way , bring your trip meter to zero and keep driving & consume all the tank , come back to the same pump & again top up all the way & divide the mileage by liter consumed.
Good luck