Well, this thread took off more than expected!
I can confirm the original scenario I posted about does work as the calculator; I paid cash on checkin to upgrade to works and earnt SP at (for me) a decent earn rate, regardless of getting a meal and a drink onboard!