Order tokens

I saw in another thread about not being able to generate any order tokens because of losses and how at the start fo the game you have a surplus and in the middle of the game you run out. This is even more so the case when there are aircraft to activate. Options that come to mind would be the limited ability to save order tokens for the next round or each fleet starts with a number of tokens to which the normal calculation of tokens is added or each fleet can never have less than x.

I have a few things to implement on my list for this issue (I will post my worklist for 1.5 shortly). They are pretty close to your suggestions.