Thats a tough choice but I would go for the test and the spay.
My Vet told me that a Cat in Heat is in a bit of pain,pyhysically and mentally.
The best of Luck with Snoopy.