I94 Question - Please suggest

[pradeepeee]

Hi,
I need your help for my I94 question. Please help me with the below questions.

When I entered US, I received an I94 upto my passport expiry date Sep'2016. My Visa stamp is also upto Sep'2016. I have my new I797 until Feb'2018. I received a new passport now and would like to extend my I94.

I went to CBP but they mentioned I need to go out of the country and re-enter US with new passport and new I797.
CBP officer also suggested to go to either Mexico or Jamainca. Re-entering US from Canada would not work as they changed rules now and they will not extend I94.

1) As my I94 is expiring Sep'2016, is it ok to re-enter US without VISA stamp if I travel before Sep'2016?
2) I live in Newyork City. I am looking at less expensive POE location from NYC for getting new I94. Can someone please suggest which POE is the best to visit and less expensive to travel from NYC.
2) What are the documents I need to carry to get new I94 until my I797 expiry (Feb'2018).
3) What questions CBP officers might ask for my situation.

Thanks