Yes, you are correct that this is a Claim of Right Repayment, which is a deduction taken in the year of repayment for an amount you thought you would keep. If you need help entering this on your return, see this article: What is a claim of right repayment?
Also yes, you have 3 years to amend your 2022 1040, and an early return is considered filed on the due date. Per the IRS, "generally, for a credit or refund, you must file Form 1040-X within 3 years after the date you filed your original return or within 2 years after the date you paid the tax, whichever is later." The due date of 2022 tax returns was April 18, 2023, because April 17th was a holiday in DC. You must file the 2022 1040-X by April 20, 2026, because April 18, 2026 is a Saturday. I would recommend not waiting until the very last day, because you will need to paper file and the mail can be slow.
Pennsylvania also has a deadline of 3 years for filing an amended individual return. They followed the federal due date of April 18th, 2023, so the amended PA return for 2022 is also April 20, 2026.
