I'm in a similar situation as OP. With the 2018 new tax law, my itemized deductions are drastically reduced. I will pay a lot more Federal tax from here on.
