Hi! About your concern in the thread i think your current timing it's already good. Maybe if you still feel strange try to move the Offset a little from 339 to 342. I listened the song with both offsets and i think the point in 342 fits a little better. But your current Offset isn't wrong either hahaha
Good luck with mapping.