As long as you end up with no penalty, it makes no difference how you eliminate the penalty. Using the annualized method (option C) is a lot more work than taking the 80% waiver. Leave it the way it is.
