or am I good with the one I have now which will have lapsed into a 2nd class?

Hate to crack your walnuts, but your first class medical won't lapse into anything, It still stays a first class medical 6 months after issue, only the priveledges associated with the medical change.