California PTE for Partnership - Making the Election and the Payment

[DTNY07]

California PTE for Partnerships. This is the first time I am doing this.  I am NY CPA.  While I do have  a few  corporate/partnership clients in CA, none of them have needed this before.  Either I am totally clueless (which is probably) or it is just easier to make this election in NY and NJ

I looked on the Pro Series message Board.  I looked on the California Franchise Tax Board.   I looked on reddit.  

It seems it is too late for 2024 to make the election (as the first payment would have been due 6/15/24).  Which makes sense to me.  What I am asking would be more for 2025 anyway.  

The Form 3804 rules (and I see this on the California FTB site as well) say an annual election is made on an original, timely filed return.  So, does that mean for the election to be in place for 2025, that i would have to make it with the 2024 extension (which is due 3/15).  There will definitely be an extension for this return as the Partnership is waiting for K-1s that normally aren't received until July/August.  Or does that mean the 2025 election can be made with the 2024 return that will be filed in August?  To add to my confusion, it says Payment 1 is due on 6/15.  So, that would make me think the election couldn't be made if the 2024 return was filed between 6/16 - 9/15, as that is after the Payment deadline of 6/15.

I guess I am also confused when it says timely filed return.  Makes me think that if 2024 is being filed now, you could still make an election for 2024.  But, as the other part says the first $1,000 payment or 50% of the PTE elective tax paid for the prior taxable year whichever is greater is due 6/15, I thought that meant by 6/15/24 and not 6/15/25. 

I appreciate any help in advance.  Thank you