Tax consultant referral for Indian taxes for NRI (USC) in Bombay or Pune

[Raj_India]

Hello,
I need to have an India based CA firm that is familiar with NRI (USC) taxation for income generated in India. I am looking to repatriate my money - so I do need a CA who has to sign some forms. Starting AY 2018-2019, since NRIs will need to fill longer form for Indian income tax (ITR-2), I will likely need some help there too. I prefer if the CA firm (or a person) is in Bombay or Pune. I have checked previous posts on the forum and some names or websites are no longer available. Hence the new request.
Ideally, if this Indian income tax firm has some tie up with US tax firm, that would be best, but it is not necessary. However, I could use a referral for US CPA firm too - preferably in Chicago area (including suburbs). Would anyone please advise?