A quick and easy solution is to add 20 seconds on to the pit time..
The system has a trigger already when it tells you that "Your driver has entered the pit lane." So add something that is already in the system to that...
If you run out of fuel from that moment to stopping in your box.. The car automatically "Ghosts" back to your box.. You complete your normal pit and then you have to wait for 20 seconds before your car is released. This could be classed as your crew "Collecting" your car from the lane and then to fire it back up again..
Something basic and can be added on to the system we already have in place without a huge re-design.
My thoughts are 10 basic updates to iGP is better than 1 huge change that might take a while to impliment and fix,,
What are your thoughts?