I may get scolded for this because there may be things going on underneath which I am unaware but.....
When I converted from forms based on tables to forms based on queries, I created the queries and created new forms based on those queries (do not use the form wizard). On the original form, I did an Edit, Select All, Copy, then pasted it into the new form based on my query. As long as the field names are the same, it will work. If they are different, then you can go into the properties and change the Control Source to the appropriate field.
Do this with all your subforms and forms, giving the new forms the names of the original forms. This will keep from having to change alot of other properties. You could add a "1" at the end of them so you can give that name to the new one. If something doesn't work out, you can take the "1" off the ends and reinstitute your original forms.
Sean.