InfoPath Dev

I have a document library with 2 content types.  Both content type templates show on the New menu and the one with the problem is set as default on New menu.  The default content type is set up in a special folder under the "Forms" folder and has two templates (template1.xsn, template.xsn) as follows:

SharePointServer\Site\DocLibrary\Forms\MyContentType1\template1.xsn

SharePointServer\Site\DocLibrary\Forms\MyContentType1\template.xsn

The current template is template1.xsn and when I publish that template from my local machine to SharePoint it appears to be uploaded because the Date Modified changes to match the date modified from my local machine.  However when a user opens the template from New menu, the old template, template.xsn is what opens.  In order to get the correct template to open for the user I have to physically copy and paste template1.xsn to SharePoint in Explorer view - only then will the correct template open.

It appears InfoPath publishing wizard is publishing the template but SharePoint is confused about which template to open.

I am logged on as an admin when I publish the template. When I open the template from New menu, as an admin, it opens the correct template but when I am logged on as a regular user it opens the old template.

How do I get SharePoint to open the correct template?

BTW in the library settings for content type, Advanced settings,  the URL to the template does point to the correct template,  template1.xsn. 

I solved the problem by deleting the 2 content types at the site level, and all remnants of it in the library, including the library itself. Then I re-published the form template (as a non content type) to a new form library. 

This was development environment anyway where I was testing how to use multiple content types in one library.  Turns out they don't act very nicely.