Pends man, I'll be doing it at 1999.99 infra.
To calculate if it's worth it simply add the costs of improvement swapping, then add the savings in infra bills, and subtract the cost of swapping from the savings. I calculated that at 1299.99 infra I'll save roughly 300,000 over 18 days from swapping. It's simply not worth it for me to do it right now.
Other things you should consider right now about your income are the GRL (currently 30.68). When it drops down you'll be making a lot more money.