Amit Shah, Gadkari to visit Goa this month