I agree his first death was heroic, but I think the ending was even better.
Forget Soran or bridges or whatever…Kirk gave up eternity in paradise to save 230,000,000 people who will never even know he existed.
That’s pretty damn heroic in my book.
The final scenes with Kirk and his death never bothered me. Though I found his appearance up to those final scenes pretty underwhelming.