All self created problems,
The bank requirements have always been for stamped letter and statement from the bank (at least the past 5 years). All your messing around at home was completely pointless, 15-30 minutes at the bank and they're happy to provide 2 copies ant no extra charge.
As for the forms, collect and fill at immigration while your waiting, done in 5 minutes and no arguments about old, new or different forms.
Photos is always a good one, I take about 10 (x2) each year, and the ones I didn't use from the years before, I just hand them the lot and they can pick the ones they like.
Like many foreigners in Thailand, advance planning/thinking is not only pointless but frustrating!