Keep calling around to find a GOOD tax professional that knows what they are talking about, because Form 3115 is the way to fix it.
Personally, I would recommend an Enrolled Agent.
https://irs.treasury.gov/rpo/rpo.jsf
