My understanding is that per current rules they can't *downgrade* your bag allowance from what you start with. So if your first leg upgraded before checkin you'd have been allowed 3 the entire flight (and the return). But since your 1st leg wasn't in first then the 2 bag allowance applied.
This is my understanding based on previous threads in FT. It may be grossly incorrect.