I hope that the general idea of the two uses of "hasta" is o.k.
.
Just one question: are there cases when you use "hasta" without "que"? for example, "Esto no está tan mal. Estoy hasta alegre".
Of course both examples are fine.
You don't always have to use "hasta que",
"Me salió tan bien que estoy hasta feliz." o "Me salió muy bien. Estoy hasta feliz"
The "que" is used to link both sentences but you can as well, make two sentences and then you don't need to use "que".