If that calculator swap is correct...then swapping is a better choice. 8 months is not that long to wait....
Read calculation form carefully!
PERCENTAGE OF SIGT'S SUPPLY TO BE SWAPPED is choosen 10% by default, if you choose 50% your SIGT will be swapped in 38 month according to calculator.