As ever, ignore MMB and go back to first principles namely the earning and burning tables on ba.com as linked by jerry a. laska above. So you earn

1. 20
2. 20
3. 10
4. 10

As to how points upgrades are handled, others have reported success in getting the underlying fare class awarded. If this is unsuccessful it may be a policy area where Nicci can help us out.