If I need to upgrade my current package before the billing date of my contract, I would have to pay for 1 full month of credits, whilst those credits will anyway expire on the billing date. Is ther...

You can add any number of credits as top up credits in your current month, that will ensure that you only buy based on your needs.