what did you end up doing about your issue? i am running into the same exact issue. Do you only file the 8606 form?
