Thank you FB for your comprehensive reply.

I take everything I read online with a pinch of salt. I know that the purpose of my visit is innocent and for that reason I see no point in lying to any CBP officer. I just have to convince the officer that I am only on holiday and have no intention of staying.

I think for future visits, the safest thing to do would be to apply for residency in Mexico and then apply for a B visa for the embassy in Mexico City.