Please do!  I hope my customer service rep got it wrong but that is what I was told.  I am in Louisiana with the same June 15th deadline as TX and OK.

Filing and paying after May 17th is fine.  But not extending and paying with the extension.