What about Conjure Animals?
This spell is a bit complex, as the caster can select HD up to his own level, I think... I have a list I made here:
Hit Dice Animal Type Hit Dice Cost
1 Baboon 1 1/4
1 Dog, Wild 1 1/4
1 Flightless Bird 1/2
1 Jackal 1/2
1 Rat, Giant 1/2
2 Badger 1 1/2
2 Flightless Bird 2
2 Herd Animal 2
2 Horse, Wild 2
3 Axe Bird 3
3 Badger, Giant 3
3 Boar, Warthog 3
3 Camel 3
3 Cattle, Wild 2 1/2
3 Dog, War 2 1/2
3 Flightless Bird 3
3 Goat, Giant 3 1/4
3 Hyena 3
3 Lion, Mountain 3 1/4
3 Lynx, Giant 2 1/2
3 Mule 3
3 Stag 3
3 Wolf 2 1/2
3 Wolverine 3
4 Ape 4 1/4
4 Bear, Black 3 3/4
4 Beaver, Giant 4
4 Boar, Wild 3 3/4
4 Bull 4
4 Eagle, Giant 4
4 Irish Deer 4
4 Jaguar 4 1/4
4 Leopard 3 1/2
4 Owl, Giant 4
4 Ram, Giant 4
4 Weasel, Giant 3 1/4
4 Wolf, Dire 3 3/4
5 Ape, Carnivorous 5
5 Buffalo 5
5 Hyena, Giant 5
5 Otter, Giant 5
5 Skunk, Giant 5
5 Stag, Giant 5
5 Wolverine, Giant 5
6 Bear, Brown 6 1/4
6 Lion 5 1/2
6 Porcupine, Giant 6
6 Tiger 6 1/4
7 Boar, Giant 7
7 Lion, Spotted 6 1/2
8 Bear, Cave 7 1/2
8 Hippopotamus 8
8 Tiger, Sabre-Tooth 8 1/2
9 Rhinoceros 8 1/2
10 Elephant 10
10 Rhinoceros, Woolly 10
11 Elephant (Loxodont) 11
12 Mastodon 12
12 Titanothere 12
13 Mammoth 13
13 Whale (Small) 13
14 Baluchitherium 14
14 Whale (Small) 14
15 Whale 15
16 Whale 16
17 Whale 17
18 Whale 18
19 Whale 19
20 Whale 20
21 Whale 21
22 Whale 22
23 Whale 23
24 Whale 24
25 Whale 25
26 Whale 26
27 Whale 27
28 Whale 28
29 Whale 29
30 Whale 30
31 Whale 31
32 Whale 32
33 Whale 33
34 Whale 34
35 Whale 35
36 Whale 36
While I have some of the icons required for this spell, most are not yet filled in, so I guess I will have to make a whole bunch more
Also, note that this spell can summon whales - but we would need some method to differentiate aquatic environments from land environments, I guess...