Moving non EEA national married to UK national back to UK

[Harrygem]

Hi.

I'm sure we're all about as confused as one another regarding Brexit but here goes;

- I was born in the UK, UK national etc.

- Wife is American

- We got married in 2016 and moved to Ireland 2 months after that.

- We've now lived in Ireland for 2.5 years and we're looking at moving back to the UK.

To cut a long story short, I'm self employed and I don't frequently earn around the earnings requirement that's being asked for regarding the marriage visa, so that's out of the window. Previously we would have to apply for an 'EEA Family Permit' visa and then apply for a residence card beyond that to secure a 5 year stay, but after looking at the residence card on the .gov website, it's claiming it'll be scrapped in December of 2020. Does this mean that Non-EU nationals who previously held a residence card will be kicked out of the country or is this system being replaced with something else? Little worried about approaching a move, and about the prospect of having to stay in Ireland for any longer, getting a little grim being away from family and friends.

Thanks for any help.

Harry.