yes, I had just realized that and added it as an edit.
I'm pretty sure you can ignore the subjunctive and still have it be correct, i.e. I don't think there is anything grammatically wrong with saying "If I was rich", at least in the sense that it wouldn't be picked up on in casual speech